diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index 0d15338c37c..eb84fdbc7c0 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -252,24 +252,11 @@ class LandedCostVoucher(Document):
 			doc.docstatus = 1
 			doc.make_bundle_using_old_serial_batch_fields(via_landed_cost_voucher=True)
 			doc.update_stock_ledger(allow_negative_stock=True, via_landed_cost_voucher=True)
-<<<<<<< HEAD
-<<<<<<< HEAD
-			doc.make_gl_entries()
-			doc.repost_future_sle_and_gle(via_landed_cost_voucher=True)
-=======
-			doc.make_gl_entries(via_landed_cost_voucher=True)
-=======
 			if d.receipt_document_type == "Purchase Receipt":
 				doc.make_gl_entries(via_landed_cost_voucher=True)
 			else:
 				doc.make_gl_entries()
-<<<<<<< HEAD
->>>>>>> 8b3d46610e (fix: parameters for PI references)
-			doc.repost_future_sle_and_gle()
->>>>>>> baa3fee1bf (fix: add LCV flag to determine negative expenses)
-=======
 			doc.repost_future_sle_and_gle(via_landed_cost_voucher=True)
->>>>>>> 54a58e9205 (chore: resolve conflicts)
 
 	def validate_asset_qty_and_status(self, receipt_document_type, receipt_document):
 		for item in self.get("items"):
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index a7a54f4f5c2..42747818d2b 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -2426,7 +2426,6 @@ class TestPurchaseReceipt(FrappeTestCase):
 		pr.reload()
 		self.assertEqual(pr.per_billed, 100)
 
-<<<<<<< HEAD
 	def test_purchase_receipt_with_use_serial_batch_field_for_rejected_qty(self):
 		batch_item = make_item(
 			"_Test Purchase Receipt Batch Item For Rejected Qty",
@@ -2913,7 +2912,7 @@ class TestPurchaseReceipt(FrappeTestCase):
 				"Serial and Batch Bundle", return_pr.items[0].rejected_serial_and_batch_bundle, "total_qty"
 			),
 		)
-=======
+
 	def test_valuation_taxes_lcv_repost_after_billing(self):
 		from erpnext.stock.doctype.landed_cost_voucher.test_landed_cost_voucher import (
 			make_landed_cost_voucher,
@@ -2960,15 +2959,7 @@ class TestPurchaseReceipt(FrappeTestCase):
 			(warehouse_account[pr.items[0].warehouse]["account"], 14000, 0, "Main - _TC"),
 		)
 		self.assertSequenceEqual(expected_gle, gl_entries)
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 53642e7417 (test: LCV entries after billing)
-=======
-		frappe.db.rollback()
->>>>>>> 8b3d46610e (fix: parameters for PI references)
-=======
 		frappe.local.enable_perpetual_inventory["_Test Company"] = old_perpetual_inventory
->>>>>>> 0b36cbe307 (fix: reset perpetual inventory flag after test)
 
 
 def prepare_data_for_internal_transfer():