# Conflicts: # frontend/pages/reception/finish-reception.vue # frontend/pages/shipment/finish-shipment.vue