diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 973eecdae6a..181def4fd4a 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -768,11 +768,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-03-04 19:03:23.426082",
-=======
  "modified": "2026-06-11 18:23:12.340065",
->>>>>>> dceb9a3c6c (fix(stock): enable quality inspection for all Stock Entry purposes)
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry",