You checked in a merge conflict file. Remove this.