edit student-edit page add update method to student controller
fix merge conflicts