diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index b7e110e6a69..b4b4e403646 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -143,11 +143,11 @@
   "contact_mobile",
   "contact_email",
   "company_shipping_address_section",
-  "shipping_address",
-  "shipping_address_display",
-  "column_break_126",
   "dispatch_address",
   "dispatch_address_display",
+  "column_break_126",
+  "shipping_address",
+  "shipping_address_display",
   "company_billing_address_section",
   "billing_address",
   "column_break_130",
@@ -1548,7 +1548,7 @@
   {
    "fieldname": "company_shipping_address_section",
    "fieldtype": "Section Break",
-   "label": "Company Shipping Address"
+   "label": "Shipping Address"
   },
   {
    "fieldname": "column_break_126",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 3eda1789140..fad9f976c8a 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -109,11 +109,11 @@
   "contact_mobile",
   "contact_email",
   "shipping_address_section",
-  "shipping_address",
-  "shipping_address_display",
-  "column_break_99",
   "dispatch_address",
   "dispatch_address_display",
+  "column_break_99",
+  "shipping_address",
+  "shipping_address_display",
   "company_billing_address_section",
   "billing_address",
   "column_break_103",
diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss
index 29a2696470f..eab615db7e5 100644
--- a/erpnext/public/scss/erpnext.scss
+++ b/erpnext/public/scss/erpnext.scss
@@ -590,6 +590,19 @@ body[data-route="pos"] {
 	justify-content: center;
 }
 
+<<<<<<< HEAD
 .frappe-control[data-fieldname="other_charges_calculation"] .ql-editor {
+=======
+.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor,
+.frappe-control[data-fieldname="address_display"] .ql-editor,
+.frappe-control[data-fieldname="shipping_address_display"] .ql-editor,
+.frappe-control[data-fieldname="shipping_address"] .ql-editor,
+.frappe-control[data-fieldname="dispatch_address_display"] .ql-editor,
+.frappe-control[data-fieldname="dispatch_address"] .ql-editor,
+.frappe-control[data-fieldname="source_address_display"] .ql-editor,
+.frappe-control[data-fieldname="target_address_display"] .ql-editor,
+.frappe-control[data-fieldname="billing_address_display"] .ql-editor,
+.frappe-control[data-fieldname="company_address_display"] .ql-editor {
+>>>>>>> 8ccd7a3e61 (refactor: address field position)
 	white-space: normal;
 }
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 8fce3be270e..c3933780203 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -112,11 +112,11 @@
   "contact_mobile",
   "contact_email",
   "section_break_98",
-  "shipping_address",
-  "shipping_address_display",
-  "column_break_100",
   "dispatch_address",
   "dispatch_address_display",
+  "column_break_100",
+  "shipping_address",
+  "shipping_address_display",
   "billing_address_section",
   "billing_address",
   "column_break_104",
@@ -1200,7 +1200,7 @@
   {
    "fieldname": "section_break_98",
    "fieldtype": "Section Break",
-   "label": "Company Shipping Address"
+   "label": "Shipping Address"
   },
   {
    "fieldname": "billing_address_section",