Fixing a merge error.