removed the .orig merge files