remove .orig from merge