edit shipment, show modal
merge changes