diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 4b40cd34c4f..3602ee8997a 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -1648,13 +1648,9 @@ class StockEntry(StockController):
 						)
 					)
 
-<<<<<<< HEAD
 		self.set_gl_entries_for_landed_cost_voucher(gl_entries, warehouse_account)
 
-		return process_gl_map(gl_entries)
-=======
 		return process_gl_map(gl_entries, from_repost=frappe.flags.through_repost_item_valuation)
->>>>>>> a96fa55704 (perf: process_gl_map causing performance issues in the reposting)
 
 	def set_gl_entries_for_landed_cost_voucher(self, gl_entries, warehouse_account):
 		landed_cost_entries = self.get_item_account_wise_lcv_entries()