Remove .orig files from merge