diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index 8c49c2865d1..cb415e3813a 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -296,11 +296,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-02-04 16:30:44.263964",
-=======
- "modified": "2025-02-18 13:06:02.789654",
->>>>>>> 8cfab57fc8 (fix: slow query)
+ "modified": "2025-02-18 13:07:02.789654",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Packed Item",
@@ -310,4 +306,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}