add waybill
fix merge