Looks like you accidentally added this leftover orig file from a git merge.  It need to be deleted.