diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 7efc43936e7..97dbcfaa4d6 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -350,11 +350,7 @@ class TransactionBase(StatusUpdater):
 		)
 
 	@frappe.whitelist()
-<<<<<<< HEAD
-	def process_item_selection(self, item_idx):
-=======
 	def process_item_selection(self, item_idx: int, reset_item_details: bool = False):
->>>>>>> e8c890a844 (fix(selling): preserve explicit UOM during item selection)
 		# Server side 'item' doc. Update this to reflect in UI
 		item_obj = self.get("items", {"idx": item_idx})[0]