diff --git a/frappe/core/doctype/transaction_log/transaction_log.py b/frappe/core/doctype/transaction_log/transaction_log.py
index 807133b907..6dc4340277 100644
--- a/frappe/core/doctype/transaction_log/transaction_log.py
+++ b/frappe/core/doctype/transaction_log/transaction_log.py
@@ -51,13 +51,8 @@ def get_current_index():
 		.where(series.name == "TRANSACTLOG")
 		.for_update()
 		.select("current")
-<<<<<<< HEAD
-		.run()
-	)
-=======
 	).run()
 
->>>>>>> b0de865eb2f8eded5236a80ea59cd4982e3035c2
 	if current and current[0][0] is not None:
 		current = current[0][0]