diff --git a/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json b/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json
index 6985d41775d..ba38d0af6f6 100644
--- a/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json
+++ b/erpnext/assets/module_onboarding/asset_onboarding/asset_onboarding.json
@@ -15,11 +15,7 @@
  "doctype": "Module Onboarding",
  "idx": 0,
  "is_complete": 0,
-<<<<<<< HEAD
- "modified": "2026-02-23 22:51:11.027665",
-=======
  "modified": "2026-02-26 10:45:47.970714",
->>>>>>> 5c48f74d4c (fix: broekn link of docs in asset onboarding)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Onboarding",