diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
index 78af9b58ecd..f4bacbcb712 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
@@ -5,7 +5,11 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
+<<<<<<< HEAD
 from frappe.utils import cint, flt, getdate
+=======
+from frappe.utils import cint, getdate
+>>>>>>> e7e2ce1271 (fix: Linting Issues)
 
 
 class TaxWithholdingCategory(Document):
@@ -272,9 +276,9 @@ def get_tax_amount(party_type, parties, inv, tax_details, posting_date, pan_no=N
 	)
 =======
 def get_lower_deduction_certificate(tax_details, pan_no):
-	ldc_name = frappe.db.get_value('Lower Deduction Certificate', 
+	ldc_name = frappe.db.get_value('Lower Deduction Certificate',
 		{
-			'pan_no': pan_no, 
+			'pan_no': pan_no,
 			'valid_from': ('>=', tax_details.from_date),
 			'valid_upto': ('<=', tax_details.to_date)
 		}, 'name')
diff --git a/erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py b/erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
index dc8bb9359dd..f2cae3fd8cd 100644
--- a/erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
+++ b/erpnext/patches/v13_0/update_dates_in_tax_withholding_category.py
@@ -3,6 +3,7 @@
 
 import frappe
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 
 def execute():
@@ -27,8 +28,12 @@ def execute():
 				"Tax Withholding Rate", rate.name, {"from_date": from_date, "to_date": to_date}
 			)
 =======
+=======
+
+>>>>>>> e7e2ce1271 (fix: Linting Issues)
 from erpnext.accounts.utils import get_fiscal_year
 
+
 def execute():
 	frappe.reload_doc('accounts', 'doctype', 'Tax Withholding Rate')