faulty merge