diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index 1fe77823aee..08a8262b246 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -864,16 +864,12 @@ class update_entries_after:
 		stock_entry.calculate_rate_and_amount(reset_outgoing_rate=False, raise_error_if_no_rate=False)
 		stock_entry.db_update()
 		for d in stock_entry.items:
-<<<<<<< HEAD
-			if d.name == voucher_detail_no or (not d.s_warehouse and d.t_warehouse):
-=======
 			# Update only the row that matches the voucher_detail_no or the row containing the FG/Scrap Item.
 			if (
 				d.name == voucher_detail_no
 				or (not d.s_warehouse and d.t_warehouse)
 				or stock_entry.purpose in ["Manufacture", "Repack"]
 			):
->>>>>>> 544ceb93cd (fix: stock entry repack amount calculation)
 				d.db_update()
 
 	def update_rate_on_delivery_and_sales_return(self, sle, outgoing_rate):