diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.js b/erpnext/selling/doctype/product_bundle/product_bundle.js
index 3096b692a7e..931a83af429 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.js
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.js
@@ -9,5 +9,28 @@ frappe.ui.form.on("Product Bundle", {
 				query: "erpnext.selling.doctype.product_bundle.product_bundle.get_new_item_code",
 			};
 		});
+<<<<<<< HEAD
+=======
+		frm.set_query("item_code", "items", () => {
+			return {
+				query: "erpnext.controllers.queries.item_query",
+			};
+		});
+
+		// A submitted bundle is immutable. To change it, create a new version
+		// (a fresh draft copied from this one) and submit that instead.
+		if (frm.doc.docstatus === 1) {
+			frm.add_custom_button(
+				__("New Version"),
+				() => {
+					frappe.model.open_mapped_doc({
+						method: "erpnext.selling.doctype.product_bundle.product_bundle.make_new_version",
+						frm: frm,
+					});
+				},
+				__("Actions")
+			);
+		}
+>>>>>>> b3867f1428 (fix: optimize product bundle item search)
 	},
 });