diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 21054a9d81b..b4733beb142 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -523,8 +523,12 @@
    "depends_on": "eval:doc.delivered_by_supplier!=1",
    "fieldname": "warehouse",
    "fieldtype": "Link",
+<<<<<<< HEAD
    "in_list_view": 1,
    "label": "Delivery Warehouse",
+=======
+   "label": "Source Warehouse",
+>>>>>>> d6e1ca0f10 (fix: inconsistent label name between parent and child)
    "oldfieldname": "reserved_warehouse",
    "oldfieldtype": "Link",
    "options": "Warehouse",
@@ -971,7 +975,11 @@
  "idx": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2025-02-28 09:45:44.934947",
+=======
+ "modified": "2026-02-20 16:39:00.200328",
+>>>>>>> d6e1ca0f10 (fix: inconsistent label name between parent and child)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order Item",