Faulty merge less fix