removing .orig file from merge conflict