Fixed getStudents
Resolved conflicts