diff --git a/erpnext/workspace_sidebar/invoicing.json b/erpnext/workspace_sidebar/invoicing.json
index 99a6b367953..0dd072deee4 100644
--- a/erpnext/workspace_sidebar/invoicing.json
+++ b/erpnext/workspace_sidebar/invoicing.json
@@ -314,7 +314,11 @@
    "type": "Link"
   }
  ],
+<<<<<<< HEAD:erpnext/workspace_sidebar/invoicing.json
  "modified": "2026-01-26 21:23:15.665712",
+=======
+ "modified": "2026-01-08 15:04:31.767795",
+>>>>>>> 8acf373e68 (fix: Workspace sidebar links for Debit/Credit Notes):erpnext/workspace_sidebar/accounting.json
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Invoicing",