diff --git a/packages/core/admin/ee/admin/pages/SettingsPage/utils/customRoutes.js.orig b/packages/core/admin/ee/admin/pages/SettingsPage/utils/customRoutes.js.orig
deleted file mode 100644
index 1051d9a282..0000000000
--- a/packages/core/admin/ee/admin/pages/SettingsPage/utils/customRoutes.js.orig
+++ /dev/null
@@ -1,41 +0,0 @@
-const routes = [];
-
-<<<<<<< HEAD
-if (strapi.features.isEnabled(strapi.features.SSO)) {
-  routes.push({
-    async Component() {
-      const component = await import(
-        /* webpackChunkName: "sso-settings-page" */ '../pages/SingleSignOn'
-      );
-=======
-if (window.strapi.features.isEnabled(strapi.features.SSO)) {
-  routes.push({
-    async Component() {
-      const component = await import(/* webpackChunkName: "sso-settings-page" */ '../SingleSignOn');
->>>>>>> feature/review-workflows-settings-setup
-
-      return component;
-    },
-    to: '/settings/single-sign-on',
-    exact: true,
-  });
-}
-
-<<<<<<< HEAD
-=======
-if (window.strapi.isEE) {
-  routes.push({
-    async Component() {
-      const component = await import(
-        /* webpackChunkName: "review-workflows-settings" */ '../pages/ReviewWorkflows'
-      );
-
-      return component;
-    },
-    to: '/settings/review-workflows',
-    exact: true,
-  });
-}
-
->>>>>>> feature/review-workflows-settings-setup
-export default routes;