Fix faulty merge