Comments added to student
Conflicts fixed