diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index 16028e041eb..45e531d6976 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -250,18 +250,8 @@
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
-<<<<<<< HEAD
  "links": [],
- "modified": "2025-11-17 18:35:54.575265",
-=======
- "links": [
-  {
-   "link_doctype": "Stock Entry",
-   "link_fieldname": "asset_repair"
-  }
- ],
  "modified": "2026-01-06 15:48:13.862505",
->>>>>>> 49f1688a51 (feat: allow data import for asset repair doctype)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",
@@ -308,4 +298,4 @@
  "title_field": "asset_name",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}