Fixing a merge problem