diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 7d7d0cb7d71..5c46d8e58d0 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -617,11 +617,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-10-14 15:10:38.373099",
-=======
  "modified": "2026-03-02 14:05:23.116017",
->>>>>>> 8c94396ad9 (perf: add index on reference_purchase_receipt column)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry Detail",