diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 5bb05f545fb..1b9ddd13f2c 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -894,11 +894,7 @@
  "image_field": "image",
  "links": [],
  "make_attachments_public": 1,
-<<<<<<< HEAD
- "modified": "2025-08-08 14:58:48.674193",
-=======
  "modified": "2025-12-04 09:11:56.029567",
->>>>>>> 70521fb9bf (fix: remove set_only_once from is_fixed_asset)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",