diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
index cf6d94ee567..c948630869b 100644
--- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
@@ -180,11 +180,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2021-01-22 12:33:45.888124",
-=======
  "modified": "2024-09-24 15:12:37.497853",
->>>>>>> 5911934dc7 (feat: added assignee email field in asset maintenance log)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Maintenance Log",
@@ -211,4 +207,4 @@
  "sort_order": "DESC",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}