diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index d3947ac676a..ce11ea2bfce 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -4,14 +4,8 @@
 
 import frappe
 from frappe import _, bold, json, msgprint
-<<<<<<< HEAD
 from frappe.query_builder.functions import CombineDatetime, Sum
 from frappe.utils import add_to_date, cint, cstr, flt, get_datetime, now
-=======
-from frappe.query_builder.functions import Sum
-from frappe.utils import add_to_date, cint, cstr, flt, now
-from frappe.utils.data import DateTimeLikeObject
->>>>>>> c7ef42ef98 (fix: sync Stock Reconciliation difference amount with GL after reposting (#56574))
 
 import erpnext
 from erpnext.accounts.utils import get_company_default