diff --git a/erpnext/accounts/workspace/accounting/accounting.json b/erpnext/accounts/workspace/accounting/accounting.json
index ed081102aa3..c6a7fc6d84c 100644
--- a/erpnext/accounts/workspace/accounting/accounting.json
+++ b/erpnext/accounts/workspace/accounting/accounting.json
@@ -621,11 +621,7 @@
    "doc_view": "List",
    "label": "Learn Accounting",
    "type": "URL",
-<<<<<<< HEAD
-   "url": "https://frappe.school/courses/erpnext-accounting?utm_source=in_app"
-=======
    "url": "https://school.frappe.io/lms/courses/erpnext-accounting?utm_source=in_app"
->>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
   },
   {
    "label": "Chart of Accounts",
diff --git a/erpnext/buying/workspace/buying/buying.json b/erpnext/buying/workspace/buying/buying.json
index 54f44ea13da..db5c7d046db 100644
--- a/erpnext/buying/workspace/buying/buying.json
+++ b/erpnext/buying/workspace/buying/buying.json
@@ -537,11 +537,7 @@
    "doc_view": "List",
    "label": "Learn Procurement",
    "type": "URL",
-<<<<<<< HEAD
-   "url": "https://frappe.school/courses/procurement?utm_source=in_app"
-=======
    "url": "https://school.frappe.io/lms/courses/procurement?utm_source=in_app"
->>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
   },
   {
    "color": "Yellow",
diff --git a/erpnext/manufacturing/workspace/manufacturing/manufacturing.json b/erpnext/manufacturing/workspace/manufacturing/manufacturing.json
index 08befc61ef0..320db68e037 100644
--- a/erpnext/manufacturing/workspace/manufacturing/manufacturing.json
+++ b/erpnext/manufacturing/workspace/manufacturing/manufacturing.json
@@ -336,11 +336,7 @@
    "doc_view": "List",
    "label": "Learn Manufacturing",
    "type": "URL",
-<<<<<<< HEAD
-   "url": "https://frappe.school/courses/manufacturing?utm_source=in_app"
-=======
    "url": "https://school.frappe.io/lms/courses/manufacturing?utm_source=in_app"
->>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
   },
   {
    "color": "Grey",
diff --git a/erpnext/projects/workspace/projects/projects.json b/erpnext/projects/workspace/projects/projects.json
index 9effb1cbda6..19c94bc8f90 100644
--- a/erpnext/projects/workspace/projects/projects.json
+++ b/erpnext/projects/workspace/projects/projects.json
@@ -210,11 +210,7 @@
    "doc_view": "List",
    "label": "Learn Project Management",
    "type": "URL",
-<<<<<<< HEAD
-   "url": "https://frappe.school/courses/project-management?utm_source=in_app"
-=======
    "url": "https://school.frappe.io/lms/courses/project-management?utm_source=in_app"
->>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
   },
   {
    "color": "Blue",
diff --git a/erpnext/selling/workspace/selling/selling.json b/erpnext/selling/workspace/selling/selling.json
index a392574e15c..d17b8438eae 100644
--- a/erpnext/selling/workspace/selling/selling.json
+++ b/erpnext/selling/workspace/selling/selling.json
@@ -639,11 +639,7 @@
    "doc_view": "List",
    "label": "Learn Sales Management",
    "type": "URL",
-<<<<<<< HEAD
-   "url": "https://frappe.school/courses/sales-management-course?utm_source=in_app"
-=======
    "url": "https://school.frappe.io/lms/courses/sales-management-course?utm_source=in_app"
->>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
   },
   {
    "label": "Point of Sale",
@@ -680,11 +676,6 @@
    "type": "Dashboard"
   }
  ],
-<<<<<<< HEAD
- "title": "Selling"
-}
-=======
  "title": "Selling",
  "type": "Workspace"
 }
->>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
diff --git a/erpnext/stock/workspace/stock/stock.json b/erpnext/stock/workspace/stock/stock.json
index 9a9e3d9e5c3..2f8435ac702 100644
--- a/erpnext/stock/workspace/stock/stock.json
+++ b/erpnext/stock/workspace/stock/stock.json
@@ -802,11 +802,7 @@
    "doc_view": "List",
    "label": "Learn Inventory Management",
    "type": "URL",
-<<<<<<< HEAD
-   "url": "https://frappe.school/courses/inventory-management?utm_source=in_app"
-=======
    "url": "https://school.frappe.io/lms/courses/inventory-management?utm_source=in_app"
->>>>>>> ef4f662c31 (chore: update links to Frappe School (#46823))
   },
   {
    "color": "Yellow",