diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 24c8be43b6f..4841e879eb9 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -3,12 +3,8 @@
 
 
 from frappe.permissions import add_user_permission, remove_user_permission
-<<<<<<< HEAD
 from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, cstr, flt, get_time, getdate, nowtime, today
-=======
 from frappe.utils import add_days, cstr, flt, get_time, getdate, nowdate, nowtime, today
->>>>>>> b603581 (fix(stock): distribute additional costs when incoming items have no value)
 
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.controllers.accounts_controller import InvalidQtyError