diff --git a/src/App.js b/src/App.js
index c52966a..0d99c8f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -15,7 +15,7 @@ export default function App() {
             <Routes>
                 <Route element={<UserAuthenticated />}>
                     <Route path='/' element={<Home />} />
-                    <Route path='/profile/:uid' element={<Profile />} />
+                    <Route path='/profile' element={<Profile />} />
                 </Route>
                 <Route path='/login' element={<Login />} />
                 <Route path='/register' element={<Register />} />
diff --git a/src/components/Dropdown/Dropdown.js b/src/components/Dropdown/Dropdown.js
index 63df2f6..1c8fc53 100644
--- a/src/components/Dropdown/Dropdown.js
+++ b/src/components/Dropdown/Dropdown.js
@@ -14,6 +14,7 @@ import LogoutIcon from '@mui/icons-material/Logout';
 import LoginIcon from '@mui/icons-material/Login';
 import HelpIcon from '@mui/icons-material/Help';
 import MessageIcon from '@mui/icons-material/Message';
+import ManageAccountsIcon from '@mui/icons-material/ManageAccounts';
 import { useEffect } from 'react';
 
 export default function Dropdown() {
@@ -53,6 +54,10 @@ export default function Dropdown() {
         }, 1500);
     }
 
+    function navigateToProfile() {
+        navigate('/profile');
+    }
+
     return (
         <React.Fragment>
             <Box
@@ -125,12 +130,20 @@ export default function Dropdown() {
                     Settings
                 </MenuItem>
                 {loggedIn ? ( // Use the 'loggedIn' state to conditionally render the Logout/Login menu item
-                    <MenuItem onClick={handleLogOut}>
-                        <ListItemIcon>
-                            <LogoutIcon fontSize='small' />
-                        </ListItemIcon>
-                        Logout
-                    </MenuItem>
+                    <>
+                        <MenuItem onClick={navigateToProfile}>
+                            <ListItemIcon>
+                                <ManageAccountsIcon fontSize='small' />
+                            </ListItemIcon>
+                            Profile
+                        </MenuItem>
+                        <MenuItem onClick={handleLogOut}>
+                            <ListItemIcon>
+                                <LogoutIcon fontSize='small' />
+                            </ListItemIcon>
+                            Logout
+                        </MenuItem>
+                    </>
                 ) : (
                     <MenuItem onClick={handleLogin}>
                         <ListItemIcon>
diff --git a/src/pages/Home/Home.jsx b/src/pages/Home/Home.jsx
index 71441c3..267e4a7 100644
--- a/src/pages/Home/Home.jsx
+++ b/src/pages/Home/Home.jsx
@@ -52,11 +52,15 @@ function Home() {
     const notify = (username) => toast.success('Welcome! ' + username);
 
     useEffect(() => {
+<<<<<<< HEAD
+        if (location?.state?.loggin || localStorage.getItem('user')) {
+=======
         if (
             location.state &&
             location.state.loggin &&
             localStorage.getItem('user')
         ) {
+>>>>>>> origin/master
             notify(JSON.parse(localStorage.getItem('user')).username);
         }
     }, []);
diff --git a/src/pages/Profile/Profile.jsx b/src/pages/Profile/Profile.jsx
index 517a277..1bf22cf 100644
--- a/src/pages/Profile/Profile.jsx
+++ b/src/pages/Profile/Profile.jsx
@@ -1,9 +1,57 @@
-import React from 'react';
-import { useParams } from 'react-router';
+import React, { useEffect, useState } from 'react';
+import { Avatar, Typography, Grid, Paper } from '@mui/material';
+import Button from '@mui/material/Button';
+import EditIcon from '@mui/icons-material/Edit';
 
 function Profile() {
-    const { uid } = useParams();
-    return <div>{uid}</div>;
+    const [userInfo, setUserInfo] = useState();
+
+    useEffect(() => {
+        if (localStorage.getItem('user')) {
+            setUserInfo(JSON.parse(localStorage.getItem('user')));
+        }
+    }, []);
+    console.log(userInfo);
+    return (
+        <Grid
+            container
+            justifyContent='center'
+            alignItems='center'
+            style={{ height: '100vh' }}
+        >
+            <Grid item xs={12} md={6}>
+                <Paper
+                    elevation={3}
+                    style={{ padding: '20px', textAlign: 'center' }}
+                >
+                    <Avatar
+                        alt='User Avatar'
+                        src='/path/to/avatar.jpg'
+                        sx={{ width: 100, height: 100, margin: '0 auto' }}
+                    />
+                    <Typography variant='h5' style={{ margin: '10px 0' }}>
+                        {userInfo?.username}
+                    </Typography>
+                    <Button variant='outlined' startIcon={<EditIcon />}>
+                        Edit
+                    </Button>
+                    <Typography variant='subtitle1'>
+                        Software Developer
+                    </Typography>
+                    <Typography variant='body1' style={{ margin: '20px 0' }}>
+                        Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+                        Nullam in commodo arcu.
+                    </Typography>
+                    <Typography variant='body2'>
+                        Email: {userInfo?.email}
+                    </Typography>
+                    <Typography variant='body2'>
+                        Location: New York, USA
+                    </Typography>
+                </Paper>
+            </Grid>
+        </Grid>
+    );
 }
 
 export default Profile;
diff --git a/src/server/.variable.env b/src/server/.variable.env
index 5b9ad71..0dcb97e 100644
--- a/src/server/.variable.env
+++ b/src/server/.variable.env
@@ -1,2 +1,6 @@
 MONGO_DB=
+<<<<<<< HEAD
 PORT=
+=======
+PORT=
+>>>>>>> origin/master
diff --git a/src/server/package-lock.json b/src/server/package-lock.json
index fbfd91c..45e3b5a 100644
--- a/src/server/package-lock.json
+++ b/src/server/package-lock.json
@@ -663,38 +663,6 @@
                 "url": "https://opencollective.com/mongoose"
             }
         },
-        "node_modules/mongoose/node_modules/mongodb": {
-            "version": "5.6.0",
-            "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.6.0.tgz",
-            "integrity": "sha512-z8qVs9NfobHJm6uzK56XBZF8XwM9H294iRnB7wNjF0SnY93si5HPziIJn+qqvUR5QOff/4L0gCD6SShdR/GtVQ==",
-            "dependencies": {
-                "bson": "^5.3.0",
-                "mongodb-connection-string-url": "^2.6.0",
-                "socks": "^2.7.1"
-            },
-            "engines": {
-                "node": ">=14.20.1"
-            },
-            "optionalDependencies": {
-                "saslprep": "^1.0.3"
-            },
-            "peerDependencies": {
-                "@aws-sdk/credential-providers": "^3.201.0",
-                "mongodb-client-encryption": ">=2.3.0 <3",
-                "snappy": "^7.2.2"
-            },
-            "peerDependenciesMeta": {
-                "@aws-sdk/credential-providers": {
-                    "optional": true
-                },
-                "mongodb-client-encryption": {
-                    "optional": true
-                },
-                "snappy": {
-                    "optional": true
-                }
-            }
-        },
         "node_modules/mongoose/node_modules/ms": {
             "version": "2.1.3",
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -1661,17 +1629,6 @@
                 "sift": "16.0.1"
             },
             "dependencies": {
-                "mongodb": {
-                    "version": "5.6.0",
-                    "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-5.6.0.tgz",
-                    "integrity": "sha512-z8qVs9NfobHJm6uzK56XBZF8XwM9H294iRnB7wNjF0SnY93si5HPziIJn+qqvUR5QOff/4L0gCD6SShdR/GtVQ==",
-                    "requires": {
-                        "bson": "^5.3.0",
-                        "mongodb-connection-string-url": "^2.6.0",
-                        "saslprep": "^1.0.3",
-                        "socks": "^2.7.1"
-                    }
-                },
                 "ms": {
                     "version": "2.1.3",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",