resolved a merge error