fix merge remote step