It looks like this file was conflicted when you merged the teacher branch. It still contains the output from the diff comparison.