Fix a bad merge.