More faulty merge fixing