diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index b747a64df43..a09e5041fd6 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -548,6 +548,17 @@
   {
    "fieldname": "section_break_pgad",
    "fieldtype": "Section Break"
+<<<<<<< HEAD
+=======
+  },
+  {
+   "fieldname": "alias",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Alias",
+   "no_copy": 1,
+   "unique": 1
+>>>>>>> 057af21cd8 (fix: party aliases should be no copy)
   }
  ],
  "grid_page_length": 50,
@@ -561,7 +572,7 @@
    "link_fieldname": "party"
   }
  ],
- "modified": "2026-06-22 12:23:09.241125",
+ "modified": "2026-06-27 16:12:33.190257",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier",
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 1cc2cde43c7..57e58b5d03f 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -682,6 +682,17 @@
   {
    "fieldname": "credit_limit_column",
    "fieldtype": "Column Break"
+<<<<<<< HEAD
+=======
+  },
+  {
+   "fieldname": "alias",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Alias",
+   "no_copy": 1,
+   "unique": 1
+>>>>>>> 057af21cd8 (fix: party aliases should be no copy)
   }
  ],
  "icon": "fa fa-user",
@@ -695,7 +706,7 @@
    "link_fieldname": "party"
   }
  ],
- "modified": "2026-06-22 12:23:19.196991",
+ "modified": "2026-06-27 16:12:10.457900",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Customer",