Add .orig files from merging to gitignore