diff --git a/erpnext/assets/doctype/asset/asset.js b/erpnext/assets/doctype/asset/asset.js
index 6f13170250d..a8802c1d67e 100644
--- a/erpnext/assets/doctype/asset/asset.js
+++ b/erpnext/assets/doctype/asset/asset.js
@@ -94,35 +94,6 @@ frappe.ui.form.on("Asset", {
 
 		if (frm.doc.docstatus == 1) {
 			if (["Submitted", "Partially Depreciated", "Fully Depreciated"].includes(frm.doc.status)) {
-<<<<<<< HEAD
-=======
-				if (frm.doc.maintenance_required && !frm.doc.maintenance_schedule) {
-					frm.add_custom_button(
-						__("Maintain Asset"),
-						function () {
-							frm.trigger("create_asset_maintenance");
-						},
-						__("Actions")
-					);
-				}
-				if (frm.doc.status === "Fully Depreciated") {
-					frm.add_custom_button(
-						__("Asset Repair"),
-						function () {
-							frm.trigger("create_asset_repair");
-						},
-						__("Actions")
-					);
-				}
-				frm.add_custom_button(
-					__("Split Asset"),
-					function () {
-						frm.trigger("split_asset");
-					},
-					__("Actions")
-				);
-
->>>>>>> c7774a95e5 (fix(asset): allow asset repair creation for fully depreciated assets)
 				frm.add_custom_button(
 					__("Transfer Asset"),
 					function () {
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index 31315a01aa4..103e4b59671 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -140,11 +140,7 @@
    "fieldtype": "Link",
    "in_list_view": 1,
    "label": "Asset",
-<<<<<<< HEAD
-   "link_filters": "[[\"Asset\",\"status\",\"not in\",[\"Work In Progress\",\"Capitalized\",\"Fully Depreciated\",\"Sold\",\"Scrapped\",\"Cancelled\",null]]]",
-=======
-   "link_filters": "[[\"Asset\",\"status\",\"not in\",[\"Work In Progress\",\"Capitalized\",\"Sold\",\"Scrapped\",\"Cancelled\"]]]",
->>>>>>> c7774a95e5 (fix(asset): allow asset repair creation for fully depreciated assets)
+   "link_filters": "[[\"Asset\",\"status\",\"not in\",[\"Work In Progress\",\"Capitalized\",\"Sold\",\"Scrapped\",\"Cancelled\",null]]]",
    "options": "Asset",
    "reqd": 1
   },
@@ -254,18 +250,8 @@
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
-<<<<<<< HEAD
  "links": [],
- "modified": "2026-01-06 15:48:13.862505",
-=======
- "links": [
-  {
-   "link_doctype": "Stock Entry",
-   "link_fieldname": "asset_repair"
-  }
- ],
- "modified": "2026-06-20 15:43:54.943335",
->>>>>>> c7774a95e5 (fix(asset): allow asset repair creation for fully depreciated assets)
+ "modified": "2026-07-13 12:00:00.000000",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",