fix a merge