Removed .orig merge file