diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index ef65296c728..f4fd40589c4 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -265,11 +265,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-08-16 15:55:25.023471",
-=======
  "modified": "2025-07-29 15:14:34.044564",
->>>>>>> 5a82b723c2 (fix: post gl entry on completion date of asset repair)
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",
@@ -314,4 +310,4 @@
  "title_field": "asset_name",
  "track_changes": 1,
  "track_seen": 1
-}
\ No newline at end of file
+}