Fix a faulty merge