diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
index add0575ccc1..02ecc11f44a 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -256,11 +256,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-02-12 10:53:32.090309",
-=======
- "modified": "2025-02-17 16:22:36.056205",
->>>>>>> fe43975cdd (fix: provision to enable naming series for SABB)
+ "modified": "2025-02-17 18:22:36.056205",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial and Batch Bundle",