diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
index f0e5830c0a7..d53382b7047 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
@@ -2655,13 +2655,8 @@ def get_ledgers_from_serial_batch_bundle(**kwargs) -> list[frappe._dict]:
 			serial_batch_table.incoming_rate,
 			bundle_table.voucher_detail_no,
 			bundle_table.voucher_no,
-<<<<<<< HEAD
 			bundle_table.posting_date,
 			bundle_table.posting_time,
-=======
-			bundle_table.posting_datetime,
-			bundle_table.type_of_transaction,
->>>>>>> 95e6c72539 (fix: inward same serial / batches in disassembly which were used)
 		)
 		.where(
 			(bundle_table.docstatus == 1)