added shipment cancel modal; changed shipment show modal
fixed merge conflict