diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 4e3ba999eb9..455f656ef3e 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -483,3 +483,11 @@ erpnext.patches.v16_0.fix_titles
 erpnext.patches.v16_0.set_not_applicable_on_german_item_tax_templates
 erpnext.patches.v16_0.clear_procedures_from_receivable_report
 erpnext.patches.v16_0.migrate_address_contact_custom_fields
+<<<<<<< HEAD
+=======
+erpnext.patches.v16_0.rename_secondary_item_type_field
+erpnext.patches.v16_0.submit_existing_product_bundles #1
+erpnext.patches.v16_0.migrate_subscription_generate_invoice_at
+erpnext.patches.v16_0.rename_subscription_billing_period_fields
+erpnext.patches.v16_0.drop_redundant_serial_no_index_from_sabb
+>>>>>>> b1b6ae98ed (perf: composite index on (serial_no, warehouse, posting_datetime))
diff --git a/erpnext/patches/v16_0/drop_redundant_serial_no_index_from_sabb.py b/erpnext/patches/v16_0/drop_redundant_serial_no_index_from_sabb.py
new file mode 100644
index 00000000000..8d376cda152
--- /dev/null
+++ b/erpnext/patches/v16_0/drop_redundant_serial_no_index_from_sabb.py
@@ -0,0 +1,7 @@
+from frappe.database.utils import drop_index_if_exists
+
+
+def execute():
+	drop_index_if_exists("tabSerial and Batch Entry", "serial_no")
+	drop_index_if_exists("tabSerial and Batch Entry", "warehouse")
+	drop_index_if_exists("tabSerial and Batch Entry", "type_of_transaction")
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
index b5d0200c1c2..293a0412bae 100644
--- a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
@@ -37,8 +37,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Serial No",
-   "options": "Serial No",
-   "search_index": 1
+   "options": "Serial No"
   },
   {
    "depends_on": "eval:parent.has_batch_no == 1",
@@ -62,8 +61,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Warehouse",
-   "options": "Warehouse",
-   "search_index": 1
+   "options": "Warehouse"
   },
   {
    "fieldname": "column_break_2",
@@ -178,8 +176,7 @@
    "fieldtype": "Data",
    "label": "Type of Transaction",
    "no_copy": 1,
-   "read_only": 1,
-   "search_index": 1
+   "read_only": 1
   },
   {
    "fieldname": "column_break_eykr",
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py
index adeb6a388da..c217efd5d04 100644
--- a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.py
@@ -42,3 +42,4 @@ class SerialandBatchEntry(Document):
 
 def on_doctype_update():
 	frappe.db.add_index("Serial and Batch Entry", ["warehouse", "batch_no", "posting_datetime"])
+	frappe.db.add_index("Serial and Batch Entry", ["warehouse", "serial_no", "posting_datetime"])