Fix faulty merge.