fix(CE): Resolve conflicts

server/config/routes.rb

@@ -54,28 +54,6 @@
       delete "schedule_syncs", to: "schedule_syncs#destroy"
     end
   end
-<<<<<<< HEAD
-=======
-  if MultiwovenApp.enterprise?
-    namespace :enterprise, defaults: { format: "json" } do
-      namespace :api do
-        namespace :v1 do
-          post "invite_signup", to: "auth#invite_signup"
-          resources :workspaces do
-            resources :users do
-              patch "update_role", on: :member
-              patch "resend_invite", on: :member
-              post "invite", on: :collection
-            end
-          end
-          resources :roles, only: [:index]
-          resources :resources, only: [:index]
-          resource :profile, only: %i[update destroy]
-        end
-      end
-    end
-  end
->>>>>>> 29becf76 (feat(CE): Add Manual Sync Schedule controller (#281))
 
   # Uncomment below if you have a root path
   root "rails/health#show"