Remove *.orig files

Removed the backup files created by the git mergetool.