Fix "not so good" merge