added to students
fixed conflicts