fix merge command