removed .orig file generaged by mergetools and added *.orig files to exclusions in .gitignore