fixing a merge issue