fix purchase and shipment
fix merge