fix merge for mbts