diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 7e5917ad742..535046aad1b 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -2828,9 +2828,6 @@ class TestSalesInvoice(FrappeTestCase):
 		self.assertEqual(sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC")
 		self.assertEqual(sales_invoice.items[0].item_tax_rate, item_tax_map)
 
-<<<<<<< HEAD
-	@change_settings("Selling Settings", {"enable_discount_accounting": 1})
-=======
 	def test_item_tax_template_change_with_grand_total_discount(self):
 		"""
 		Test that when item tax template changes due to discount on Grand Total,
@@ -2885,8 +2882,7 @@ class TestSalesInvoice(FrappeTestCase):
 
 		si.submit()
 
-	@IntegrationTestCase.change_settings("Selling Settings", {"enable_discount_accounting": 1})
->>>>>>> f00aeec9b4 (Merge pull request #51787 from ljain112/fix-taxes-disc)
+	@change_settings("Selling Settings", {"enable_discount_accounting": 1})
 	def test_sales_invoice_with_discount_accounting_enabled(self):
 		discount_account = create_account(
 			account_name="Discount Account",
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index f871e7d1b3b..102622adf7a 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -42,13 +42,8 @@ class calculate_taxes_and_totals:
 		items = list(filter(lambda item: not item.get("is_alternative"), self.doc.get("items")))
 		return items
 
-<<<<<<< HEAD
-	def calculate(self):
-		if not len(self._items):
-=======
 	def calculate(self, ignore_tax_template_validation=False):
-		if not len(self.doc.items):
->>>>>>> f00aeec9b4 (Merge pull request #51787 from ljain112/fix-taxes-disc)
+		if not len(self._items):
 			return
 
 		self.discount_amount_applied = False