Remove .orig file created during merge.