ignore .orig files when merging