removed a merge file