diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index d620fecdd..92443bf94 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <nav class="flex flex-col flex-1 px-2 bg-white border-r dark:border-coolgray-200 border-neutral-300 dark:bg-base"
     x-data="{
         switchWidth() {
diff --git a/routes/web.php b/routes/web.php
index f970df406..14e7590ed 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -248,10 +248,10 @@ Route::middleware(['auth', 'verified'])->group(function () {
 
     Route::get('/servers', ServerIndex::class)->name('server.index');
     
-    // Global deployments page - shows all deployments across all projects
+    // Route::get('/server/new', ServerCreate::class)->name('server.create');
+    
     Route::get('/deployments', GlobalDeploymentIndex::class)->name('deployment.index');
     
-    Route::get('/server/new', ServerCreate::class)->name('server.create');
 
     Route::prefix('server/{server_uuid}')->group(function () {
         Route::get('/', ServerShow::class)->name('server.show');