Fixing a merge conflict