diff --git a/erpnext/stock/doctype/shipment/shipment.json b/erpnext/stock/doctype/shipment/shipment.json
index aaa2515656b..8b6e70ac65b 100644
--- a/erpnext/stock/doctype/shipment/shipment.json
+++ b/erpnext/stock/doctype/shipment/shipment.json
@@ -440,11 +440,7 @@
  ],
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-11-17 17:23:27.025802",
-=======
  "modified": "2025-02-20 16:55:20.076418",
->>>>>>> 1ec182430d (feat: add total weight in shipment (#46049))
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Shipment",