Fix a broken merge.