resolve conflicts with last updated student