fixing a merge error