Fix an incorrect merge.