diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index e0b5e2b4aaa..31726dff277 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -304,22 +304,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-02-18 13:07:02.789654",
-=======
  "modified": "2025-07-09 19:12:45.850219",
->>>>>>> f3460ec840 (fix: carry forward the delivered_by_supplier check to PO)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Packed Item",
  "owner": "Administrator",
  "permissions": [],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> f3460ec840 (fix: carry forward the delivered_by_supplier check to PO)
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1