Fixing a merge error