Fixing a merge miss