remove merge .orig file