diff --git a/erpnext/controllers/tests/test_item_wise_tax_details.py b/erpnext/controllers/tests/test_item_wise_tax_details.py
index c7a61fcb47d..30f1e51d7f4 100644
--- a/erpnext/controllers/tests/test_item_wise_tax_details.py
+++ b/erpnext/controllers/tests/test_item_wise_tax_details.py
@@ -2,12 +2,7 @@ import json
 
 import frappe
 
-<<<<<<< HEAD
-from erpnext.controllers.taxes_and_totals import calculate_taxes_and_totals
-from erpnext.tests.utils import ERPNextTestSuite
-=======
 from erpnext.tests.utils import ERPNextTestSuite, change_settings
->>>>>>> fc8437c499 (test: update item-wise tax detail test for high conversion rates)
 
 
 class TestTaxesAndTotals(ERPNextTestSuite):