diff --git a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
index 6cdd2bac0d6..4979db1bf4d 100644
--- a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
@@ -261,7 +261,11 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-11-14 18:34:48.327224",
+=======
+ "modified": "2026-01-31 19:46:27.884592",
+>>>>>>> d9998a977c (fix: make item name editable in RFQ)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Request for Quotation Item",