send code to student
remove conflicts
fix minor errors