Fix lazy merge