Fixing a merge issue