fix faulty merge