diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
index 427525225d4..5c0a18baccb 100644
--- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
@@ -4,12 +4,7 @@
 import unittest
 
 import frappe
-<<<<<<< HEAD
-from frappe.utils import flt, nowdate, nowtime, today
-=======
-from frappe.tests import IntegrationTestCase
 from frappe.utils import add_months, flt, get_first_day, nowdate, nowtime, today
->>>>>>> cfe04a2aaf (test: asset status validation)
 
 from erpnext.assets.doctype.asset.asset import (
 	get_asset_account,