orig-merge file removed