Fixed lazy merge