Fix a broken merge