It looks like you have committed some un-merged changes in this file.