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 6f0822beddf..68a0af132cc 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
@@ -264,11 +264,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2025-09-15 14:37:26.441742",
-=======
- "modified": "2025-05-30 18:05:55.489195",
->>>>>>> 0557d4d180 (fix: incorrect serial no status after delivery note cancel (#47825))
+ "modified": "2025-09-16 14:37:26.441742",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial and Batch Bundle",
@@ -402,12 +398,7 @@
    "write": 1
   }
  ],
-<<<<<<< HEAD
  "sort_field": "modified",
-=======
- "row_format": "Dynamic",
- "sort_field": "creation",
->>>>>>> 0557d4d180 (fix: incorrect serial no status after delivery note cancel (#47825))
  "sort_order": "DESC",
  "states": [],
  "title_field": "item_code"