fixed .orig from merge