diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index a4e50467baa..260dc52ceac 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -9,11 +9,6 @@
  "engine": "InnoDB",
  "field_order": [
   "supplier_section",
-<<<<<<< HEAD
-  "title",
-=======
-  "company",
->>>>>>> 5b1fa81451 (fix(accounts): set supplier name as title field in Purchase Invoice (#53710))
   "naming_series",
   "supplier",
   "supplier_name",