diff --git a/erpnext/desktop_icon/accounting.json b/erpnext/desktop_icon/accounting.json
index 72f393c14f1..27b8c4dea21 100644
--- a/erpnext/desktop_icon/accounting.json
+++ b/erpnext/desktop_icon/accounting.json
@@ -9,13 +9,21 @@
  "idx": 1,
  "label": "Accounting",
  "link_to": "Accounting",
+<<<<<<< HEAD
  "link_type": "Workspace Sidebar",
  "modified": "2026-01-01 20:07:01.203651",
+=======
+ "link_type": "Workspace",
+ "modified": "2025-12-31 16:06:04.678577",
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
  "modified_by": "Administrator",
  "name": "Accounting",
  "owner": "Administrator",
  "parent_icon": "Accounts",
+<<<<<<< HEAD
  "restrict_removal": 0,
+=======
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
  "roles": [],
  "standard": 1
 }
diff --git a/erpnext/desktop_icon/financial_reports.json b/erpnext/desktop_icon/financial_reports.json
index e4425ad1544..52f39a6fa43 100644
--- a/erpnext/desktop_icon/financial_reports.json
+++ b/erpnext/desktop_icon/financial_reports.json
@@ -9,13 +9,21 @@
  "idx": 0,
  "label": "Financial Reports",
  "link_to": "Financial Reports",
+<<<<<<< HEAD
  "link_type": "Workspace Sidebar",
  "modified": "2026-01-01 20:07:01.253367",
+=======
+ "link_type": "Workspace",
+ "modified": "2025-12-31 16:07:27.060176",
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
  "modified_by": "Administrator",
  "name": "Financial Reports",
  "owner": "Administrator",
  "parent_icon": "Accounts",
+<<<<<<< HEAD
  "restrict_removal": 0,
+=======
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
  "roles": [],
  "sidebar": "",
  "standard": 1
diff --git a/erpnext/desktop_icon/taxes.json b/erpnext/desktop_icon/taxes.json
index 80f27387e78..f8c45b16466 100644
--- a/erpnext/desktop_icon/taxes.json
+++ b/erpnext/desktop_icon/taxes.json
@@ -8,9 +8,15 @@
  "icon_type": "Link",
  "idx": 3,
  "label": "Taxes",
+<<<<<<< HEAD
  "link_to": "Taxes",
  "link_type": "Workspace Sidebar",
  "modified": "2026-01-01 20:07:01.356333",
+=======
+ "link_to": "Sales Taxes and Charges Template",
+ "link_type": "DocType",
+ "modified": "2025-12-31 16:59:14.978584",
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
  "modified_by": "Administrator",
  "name": "Taxes",
  "owner": "Administrator",
diff --git a/erpnext/workspace_sidebar/accounting.json b/erpnext/workspace_sidebar/accounting.json
index 0246a1f31b2..2a7924c8d6a 100644
--- a/erpnext/workspace_sidebar/accounting.json
+++ b/erpnext/workspace_sidebar/accounting.json
@@ -67,7 +67,11 @@
   {
    "child": 1,
    "collapsible": 1,
+<<<<<<< HEAD
    "filters": "[[\"Sales Invoice\",\"is_return\",\"=\",1]]",
+=======
+   "filters": "",
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
    "icon": "",
    "indent": 0,
    "keep_closed": 0,
@@ -542,7 +546,7 @@
    "icon": "",
    "indent": 0,
    "keep_closed": 0,
-   "label": "Accounts Settings",
+   "label": "Settings",
    "link_to": "Accounts Settings",
    "link_type": "DocType",
    "show_arrow": 0,
@@ -571,7 +575,11 @@
    "type": "Link"
   }
  ],
+<<<<<<< HEAD
  "modified": "2026-01-10 00:06:13.234927",
+=======
+ "modified": "2025-12-31 16:54:07.693056",
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting",
diff --git a/erpnext/workspace_sidebar/assets.json b/erpnext/workspace_sidebar/assets.json
index 5f54ce2bd35..c3f644d529a 100644
--- a/erpnext/workspace_sidebar/assets.json
+++ b/erpnext/workspace_sidebar/assets.json
@@ -258,7 +258,11 @@
    "url": ""
   }
  ],
+<<<<<<< HEAD
  "modified": "2026-01-10 00:06:13.218453",
+=======
+ "modified": "2025-12-31 16:27:44.936562",
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Assets",
diff --git a/erpnext/workspace_sidebar/taxes.json b/erpnext/workspace_sidebar/taxes.json
index 5cf65ff3c67..03c965b35ad 100644
--- a/erpnext/workspace_sidebar/taxes.json
+++ b/erpnext/workspace_sidebar/taxes.json
@@ -13,7 +13,11 @@
    "indent": 0,
    "keep_closed": 0,
    "label": "Sales Tax Template",
+<<<<<<< HEAD
    "link_to": "Item Tax Template",
+=======
+   "link_to": "Sales Taxes and Charges",
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
    "link_type": "DocType",
    "navigate_to_tab": "",
    "show_arrow": 0,
@@ -46,6 +50,7 @@
   {
    "child": 0,
    "collapsible": 1,
+<<<<<<< HEAD
    "icon": "database",
    "indent": 1,
    "keep_closed": 1,
@@ -57,6 +62,8 @@
   {
    "child": 1,
    "collapsible": 1,
+=======
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
    "icon": "triangle",
    "indent": 0,
    "keep_closed": 0,
@@ -67,7 +74,11 @@
    "type": "Link"
   },
   {
+<<<<<<< HEAD
    "child": 1,
+=======
+   "child": 0,
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
    "collapsible": 1,
    "icon": "book-open-text",
    "indent": 0,
@@ -79,7 +90,11 @@
    "type": "Link"
   },
   {
+<<<<<<< HEAD
    "child": 1,
+=======
+   "child": 0,
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
    "collapsible": 1,
    "icon": "book-text",
    "indent": 0,
@@ -148,7 +163,11 @@
    "type": "Link"
   }
  ],
+<<<<<<< HEAD
  "modified": "2026-01-10 00:06:13.005238",
+=======
+ "modified": "2025-12-31 16:55:52.262432",
+>>>>>>> b93f920592 (fix: sidebar items for accounts (#51418))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Taxes",