edit students
merge fix