accidentally committed a merge file