fix a merge issue