Those are not comments, those are merge conflicts that happened because you tried to merge a part of a file that was edited differently in those two branches.
Since you are using git, you should read a little about it and its merging tool, and fix the file properly before deploying. Try to read about merge conflicts in the git documentation: http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging