fix merge simu