diff --git a/.replit b/.replit
index f1bbfc88..5586ae74 100644
--- a/.replit
+++ b/.replit
@@ -41,3 +41,7 @@ externalPort = 3000
 [[ports]]
 localPort = 37143
 externalPort = 3001
+
+[[ports]]
+localPort = 37623
+externalPort = 3002
diff --git a/src/components/auth/AuthButtons.tsx b/src/components/auth/AuthButtons.tsx
index c476bcaf..1683b945 100644
--- a/src/components/auth/AuthButtons.tsx
+++ b/src/components/auth/AuthButtons.tsx
@@ -71,27 +71,12 @@ export function AuthButtons() {
   return <DropdownMenu>
       <DropdownMenuTrigger asChild>
         <Button variant="ghost" className="relative h-8 w-8 rounded-full">
-<<<<<<< HEAD
-          <Avatar className="h-8 w-8" key={profile?.avatar_url || 'fallback'}>
-            <AvatarImage 
-              src={profile?.avatar_url || undefined}
-              alt={profile?.display_name || profile?.username || user.email || 'User avatar'}
-              onError={(e) => {
-                e.currentTarget.src = ''; // Force fallback
-              }}
-            />
-            <AvatarFallback className="bg-primary/10 text-primary font-medium">
-              {(profile?.display_name || profile?.username || user.email || 'U').charAt(0).toUpperCase()}
-            </AvatarFallback>
-          </Avatar>
-=======
           <UserAvatar 
             key={profile?.avatar_url || 'no-avatar'}
             avatarUrl={profile?.avatar_url}
             fallbackText={profile?.display_name || profile?.username || user.email || 'U'}
             size="sm"
           />
->>>>>>> b91d798 (Improve user avatar display to ensure consistency and reliability)
         </Button>
       </DropdownMenuTrigger>
       <DropdownMenuContent className="w-56" align="end" forceMount>