Fix landing merge