update project planning
conflicts resolved on dashboard etudiant