diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 5cf2a556ee2..c38b3d997a3 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -5,12 +5,8 @@
 import frappe
 from frappe.permissions import add_user_permission, remove_user_permission
 from frappe.tests.utils import FrappeTestCase, change_settings
-<<<<<<< HEAD
-from frappe.utils import add_days, flt, nowdate, nowtime, today
-from six import iteritems
-=======
 from frappe.utils import add_days, flt, now, nowdate, nowtime, today
->>>>>>> f31612376a (test: added test case to validate audit for incorrect entries)
+from six import iteritems
 
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.stock.doctype.item.test_item import (