merge conflict on edit delete student section of show.html.erb