remove conflict .orig file