diff --git a/src/App.vue b/src/App.vue
index 3cd1907..91bca8c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -41,9 +41,6 @@ onMounted(async () => {
         class="sticky top-0 z-50 w-full border-b bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/60">
         <nav class="w-full max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 xl:px-12 2xl:px-16 flex h-14 lg:h-16 xl:h-20 items-center justify-between">
           <Navbar />
-          <<<<<<< HEAD <ConnectionStatus :is-connected="isConnected" :is-connecting="isConnecting" :error="error" />
-          =======
-          >>>>>>> 4686e5e (refactor: Transition to authentication system and remove identity management)
         </nav>
       </header>
 
@@ -56,14 +53,7 @@ onMounted(async () => {
 
     <!-- Toast notifications -->
     <Toaster />
-
-    <<<<<<< HEAD <!-- Password unlock dialog -->
-      <PasswordDialog v-model:is-open="showPasswordDialog" title="Unlock Identity"
-        description="Your Nostr identity is encrypted. Enter your password to unlock it."
-        @password="handlePasswordUnlock" @cancel="handlePasswordCancel" />
-      =======
-      <!-- Login dialog -->
-      <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
-      >>>>>>> 4686e5e (refactor: Transition to authentication system and remove identity management)
+    <!-- Login dialog -->
+    <LoginDialog v-model:is-open="showLoginDialog" @success="handleLoginSuccess" />
   </div>
 </template>