Fix a bad merge