diff --git a/erpnext/assets/doctype/asset/asset_dashboard.py b/erpnext/assets/doctype/asset/asset_dashboard.py
index 461a67dbfc6..c81b611a418 100644
--- a/erpnext/assets/doctype/asset/asset_dashboard.py
+++ b/erpnext/assets/doctype/asset/asset_dashboard.py
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-
-=======
 from frappe import _
->>>>>>> 16de29a3cb (fix(translation) - correction for translation)
+
 
 def get_data():
 	return {