deleted .orig files from merge
added .orig files to the .gitignore