diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
index b611d75740c..0de009ecb9f 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -1621,13 +1621,6 @@
   {
    "fieldname": "column_break_bhao",
    "fieldtype": "Column Break"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "auto_repeat_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat"
   },
   {
    "fieldname": "section_break_clmv",
@@ -1640,17 +1633,12 @@
    "label": "Title",
    "no_copy": 1,
    "print_hide": 1
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
   }
  ],
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-02-10 14:23:07.181782",
-=======
  "modified": "2026-03-30 12:15:57.253316",
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 63f2a7846e0..6403b89123d 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1685,19 +1685,10 @@
    "fieldname": "totals_section",
    "fieldtype": "Section Break",
    "label": "Totals"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "automation_section",
-   "fieldtype": "Section Break",
-   "label": "Automation"
   },
   {
    "fieldname": "section_break_ecfi",
    "fieldtype": "Section Break"
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
   }
  ],
  "grid_page_length": 50,
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index fcd55afe405..35cc4e915cd 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2322,10 +2322,7 @@
    "collapsible": 1,
    "fieldname": "utm_analytics_section",
    "fieldtype": "Section Break",
-<<<<<<< HEAD
    "label": "UTM Analytics"
-=======
-   "label": "Automation"
   },
   {
    "fieldname": "section_break_sgnf",
@@ -2338,7 +2335,6 @@
    "label": "Title",
    "no_copy": 1,
    "print_hide": 1
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
   }
  ],
  "grid_page_length": 50,
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 6755251a8bf..685e3ab649a 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1319,19 +1319,10 @@
    "fieldtype": "Time",
    "label": "Time",
    "mandatory_depends_on": "is_internal_supplier"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "collapsible": 1,
-   "fieldname": "auto_repeat_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat"
   },
   {
    "fieldname": "section_break_zymg",
    "fieldtype": "Section Break"
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
   }
  ],
  "grid_page_length": 50,
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 2815c0dfb29..e5eeec1510f 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -940,18 +940,10 @@
    "no_copy": 1,
    "options": "Item Wise Tax Detail",
    "print_hide": 1
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "auto_repeat_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat"
   },
   {
    "fieldname": "section_break_wwao",
    "fieldtype": "Section Break"
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
   }
  ],
  "grid_page_length": 50,
@@ -960,11 +952,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2026-01-29 21:23:13.778468",
-=======
  "modified": "2026-03-30 12:18:35.777574",
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Quotation",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 96fcffb1b1d..2b1f097a945 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -470,11 +470,7 @@ erpnext.patches.v16_0.complete_onboarding_steps_for_older_sites #2
 erpnext.patches.v16_0.migrate_asset_type_checkboxes_to_select
 erpnext.patches.v16_0.update_order_qty_and_requested_qty_based_on_mr_and_po
 erpnext.patches.v16_0.enable_serial_batch_setting
-<<<<<<< HEAD
-=======
 erpnext.patches.v16_0.correct_po_titles
-erpnext.patches.v16_0.co_by_product_patch
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
 erpnext.patches.v16_0.update_requested_qty_packed_item
 erpnext.patches.v16_0.remove_payables_receivables_workspace
 erpnext.patches.v16_0.co_by_product_patch
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 5c639d5d2a4..2a2bcf887c4 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1124,13 +1124,6 @@
    "fieldname": "utm_analytics_section",
    "fieldtype": "Section Break",
    "label": "UTM Analytics"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "auto_repeat_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat"
   },
   {
    "fieldname": "section_break_cojf",
@@ -1143,7 +1136,6 @@
    "label": "Title",
    "no_copy": 1,
    "print_hide": 1
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
   }
  ],
  "icon": "fa fa-shopping-cart",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 14058a6c858..2c71de9eb07 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1744,20 +1744,6 @@
    "hidden": 1,
    "label": "Ignore Default Payment Terms Template",
    "read_only": 1
-<<<<<<< HEAD
-=======
-  },
-  {
-   "allow_on_submit": 1,
-   "collapsible": 1,
-   "fieldname": "auto_repeat_section",
-   "fieldtype": "Section Break",
-   "hide_days": 1,
-   "hide_seconds": 1,
-   "label": "Auto Repeat",
-   "no_copy": 1,
-   "print_hide": 1,
-   "read_only": 1
   },
   {
    "fieldname": "section_break_umok",
@@ -1770,7 +1756,6 @@
    "label": "Title",
    "no_copy": 1,
    "print_hide": 1
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
   }
  ],
  "grid_page_length": 50,
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 247d62a6f2c..e9f85045c94 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -1446,13 +1446,8 @@
    "label": "UTM Analytics"
   },
   {
-<<<<<<< HEAD
    "fieldname": "column_break_neoj",
    "fieldtype": "Column Break"
-=======
-   "fieldname": "auto_repeat_section",
-   "fieldtype": "Section Break",
-   "label": "Auto Repeat"
   },
   {
    "fieldname": "section_break_bxkw",
@@ -1465,7 +1460,6 @@
    "label": "Title",
    "no_copy": 1,
    "print_hide": 1
->>>>>>> bd9427623f (refactor: bring back titles on sales transactions and make them optional and visible on purchase transactions (#52633))
   }
  ],
  "icon": "fa fa-truck",