Added *.orig files (from merge conflicts) to .gitignore