diff --git a/backend/projects/urls.py b/backend/projects/urls.py
index d441ef4..08ba440 100644
--- a/backend/projects/urls.py
+++ b/backend/projects/urls.py
@@ -1,11 +1,12 @@
 from django.urls import path
-from .views import ProjectCRUDView, get_projects, toggle_follow, toggle_like, project_member_hander
+from .views import ProjectCRUDView, get_projects, toggle_follow, toggle_like, project_member_hander, check_like_status
 
 urlpatterns = [
     path('', get_projects, name='get_projects'),  # Fetch all projects
     path('create/', ProjectCRUDView.as_view(), name='project-create'),  # Create project
     path('<str:pk>/', ProjectCRUDView.as_view(), name='project-detail'),  # Read, Update, Delete project by ID
-    path('like/<str:project_id>', toggle_like, name='toggle_like'), 
-    path('follow/<str:project_id>', toggle_follow, name='toggle_follow'),
-    path('member/manage/<str:project_id>', project_member_hander, name='project-member-handler'),
+    path('like/<str:project_id>/', toggle_like, name='toggle_like'), 
+    path('follow/<str:project_id>/', toggle_follow, name='toggle_follow'),
+    path('member/manage/<str:project_id>/', project_member_hander, name='project-member-handler'),
+    path('likes/check/<str:user_id>/<str:project_id>/', check_like_status, name='check_like_status')
 ]
diff --git a/backend/projects/views.py b/backend/projects/views.py
index bbb9224..36ad92c 100644
--- a/backend/projects/views.py
+++ b/backend/projects/views.py
@@ -155,3 +155,14 @@ def project_member_hander(request, project_id):
     except User.DoesNotExist:
         return Response({'error': 'User not found'}, status=404)
             
+@api_view(['GET'])
+@permission_classes([AllowAny])
+def check_like_status(request, user_id, project_id):
+    try:
+        project = get_object_or_404(Project, id=project_id)
+        user = get_object_or_404(User, id=user_id)
+
+        liked = Like.objects.filter(project=project, user=user).exists()
+        return Response({'liked': liked}, status=status.HTTP_200_OK)
+    except Exception as e:
+        return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST)
diff --git a/backend/userauth/admin.py b/backend/userauth/admin.py
index bde25d4..9367300 100644
--- a/backend/userauth/admin.py
+++ b/backend/userauth/admin.py
@@ -10,4 +10,8 @@ class UserAdmin(admin.ModelAdmin):
     )
     search_fields = ('username', 'email', 'first_name', 'last_name')
     list_filter = ('location',)
+<<<<<<< HEAD
+    filter_horizontal = ('projects', 'owned')
+=======
     filter_horizontal = ('projects',)
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
diff --git a/backend/userauth/models.py b/backend/userauth/models.py
index 23c384b..fdfd0a0 100644
--- a/backend/userauth/models.py
+++ b/backend/userauth/models.py
@@ -9,10 +9,14 @@ class User(models.Model):
     email = models.EmailField(unique=True, blank=True, null=True)  
     first_name = models.CharField(max_length=255, default="")
     last_name = models.CharField(max_length=255, default="")
+<<<<<<< HEAD
+    colleges = ArrayField(models.CharField(max_length=225), blank=True, null=True)  
+=======
     college = models.CharField(max_length=255, default="")
     major = models.CharField(max_length=255, default="")
     grad_date = models.CharField(max_length=255, default="")
     about_me = models.TextField(max_length=500, blank=True, null=True)  
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
     followers = models.IntegerField(default=0)
     likes = models.IntegerField(default=0)
     roles = models.JSONField(default=list)
diff --git a/backend/userauth/urls.py b/backend/userauth/urls.py
index d1253fd..4acbb4f 100644
--- a/backend/userauth/urls.py
+++ b/backend/userauth/urls.py
@@ -1,9 +1,17 @@
 from django.urls import path
+<<<<<<< HEAD
+from .views import UsersCRUDView, check_if_onboarded
+=======
 from .views import UsersCRUDView, check_if_onboarded, fetch_by_uuid
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
 urlpatterns = [
     path('onboard/', UsersCRUDView.as_view(),  name='onboard-user'),  # Create user
     path('onboard/check/<str:clerk_id>', check_if_onboarded, name="onboard-check"), # Check if user onboarded
+<<<<<<< HEAD
+    path('<str:pk>/', UsersCRUDView.as_view(), name='user'),  # Read, Update, Delete user by ID
+=======
     path('<str:clerk_id>/', UsersCRUDView.as_view(), name='user'),  # Read, Update, Delete user by ID
     path('fetch/<str:uuid>/', fetch_by_uuid, name='uuid-fetch'),  
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 ]
diff --git a/backend/userauth/views.py b/backend/userauth/views.py
index 14aff4b..71aaf91 100644
--- a/backend/userauth/views.py
+++ b/backend/userauth/views.py
@@ -6,6 +6,60 @@
 from .serializers import UserSerializer
 from rest_framework.permissions import AllowAny
 from rest_framework.decorators import api_view, permission_classes
+<<<<<<< HEAD
+
+@api_view(['GET'])
+@permission_classes([AllowAny])
+def check_if_onboarded(request, clerk_id):
+    if User.objects.filter(auth_id=clerk_id).exists():
+        return Response({"message": "User already onboarded"})
+    else:
+        return Response({"message": "User not onboarded yet!"})
+
+# DRF CRUD views for Users model
+class UsersCRUDView(APIView):
+    permission_classes = [AllowAny]
+    # Onboard a new user (POST)
+    def post(self, request):
+        serializer = UserSerializer(data=request.data)
+        if serializer.is_valid():
+            serializer.save()
+            return Response({
+                "message": "User successfully onboarded",
+                "data": serializer.data
+            }, status=status.HTTP_201_CREATED)
+        else:
+            print(serializer.errors)
+            error_details = {
+                "message": "Invalid user data provided.",
+                "errors": serializer.errors,
+            }
+            return Response(error_details, status=status.HTTP_400_BAD_REQUEST)
+
+    # Get a single user by ID (GET)
+    def get(self, request, pk):
+        user = get_object_or_404(User, pk=pk)
+        serializer = UserSerializer(user)
+        return Response(serializer.data)
+
+    # Update an existing user by ID (PUT)
+    def put(self, request, pk):
+        user = get_object_or_404(User, pk=pk)
+        serializer = UserSerializer(user, data=request.data, partial=True)
+        if serializer.is_valid():
+            serializer.save()
+            return Response({
+                "message": "User successfully updated!",
+                "data": serializer.data
+            }, status=status.HTTP_201_CREATED)
+        else:
+            print(serializer.errors)
+            error_details = {
+                "message": "Invalid user data provided.",
+                "errors": serializer.errors,
+            }
+            return Response(error_details, status=status.HTTP_400_BAD_REQUEST)
+=======
 
 @api_view(['GET'])
 @permission_classes([AllowAny])
@@ -80,3 +134,4 @@ def put(self, request, clerk_id):
             return Response(error_details, status=status.HTTP_400_BAD_REQUEST)
 
 
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
diff --git a/frontend/bitmatch/package-lock.json b/frontend/bitmatch/package-lock.json
index 94d3783..afe1927 100644
--- a/frontend/bitmatch/package-lock.json
+++ b/frontend/bitmatch/package-lock.json
@@ -9,7 +9,10 @@
       "version": "0.0.0",
       "dependencies": {
         "@clerk/clerk-react": "^5.24.0",
+<<<<<<< HEAD
+=======
         "@google/genai": "^0.10.0",
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
         "@radix-ui/react-checkbox": "^1.1.4",
         "@radix-ui/react-dialog": "^1.1.6",
         "@radix-ui/react-label": "^2.1.2",
diff --git a/frontend/bitmatch/package.json b/frontend/bitmatch/package.json
index 68d6e6f..0d0af61 100644
--- a/frontend/bitmatch/package.json
+++ b/frontend/bitmatch/package.json
@@ -11,7 +11,10 @@
   },
   "dependencies": {
     "@clerk/clerk-react": "^5.24.0",
+<<<<<<< HEAD
+=======
     "@google/genai": "^0.10.0",
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
     "@radix-ui/react-checkbox": "^1.1.4",
     "@radix-ui/react-dialog": "^1.1.6",
     "@radix-ui/react-label": "^2.1.2",
diff --git a/frontend/bitmatch/src/App.jsx b/frontend/bitmatch/src/App.jsx
index d99e804..b4fa804 100644
--- a/frontend/bitmatch/src/App.jsx
+++ b/frontend/bitmatch/src/App.jsx
@@ -15,7 +15,10 @@ import ProjectListPage from "./views/ProjectListPage";
 import ProjectDetailPage from "./views/IndividualProjectPage";
 import AddProjectPage from "./views/AddProjectPage";
 import ProfilePage from "./views/ProfilePage";
+<<<<<<< HEAD
+=======
 import AboutPage from "./views/AboutPage";
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
 import OnboardPage from "./views/OnboardPage";
 import InterestPage from "./components/onboarding/Interest";
@@ -34,9 +37,14 @@ function AppRoutes() {
   const pathname = location.pathname;
   const isLanding = pathname === "/" && !isSignedIn;
   const isOnboard = pathname.startsWith("/onboard");
+<<<<<<< HEAD
+
+  const shouldUseContainer = !isLanding && !isOnboard;
+=======
   const isAbout = pathname.startsWith("/about");
 
   const shouldUseContainer = !isLanding && !isOnboard && !isAbout;
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
   const layoutClass = shouldUseContainer
     ? "container mx-auto px-4 py-16 pb-6 min-h-screen"
@@ -89,7 +97,11 @@ function AppRoutes() {
             }
           />
           <Route
+<<<<<<< HEAD
+            path="/my-profile"
+=======
             path="/profile/:id"
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
             element={
               <SignedIn>
                 <ProfilePage />
@@ -98,6 +110,18 @@ function AppRoutes() {
           />
 
           {/* Onboarding */}
+<<<<<<< HEAD
+          <Route path="/onboard" element={<OnboardPage />}>
+            <Route path="interests" element={<InterestPage />} />
+            <Route path="location" element={<LocationPage />} />
+            <Route path="positions" element={<PositionPage />} />
+            <Route path="skills" element={<SkillsPage />} />
+            <Route path="user" element={<UserPage />} />
+          </Route>
+        </Routes>
+      </main>
+
+=======
           <Route
             path="/onboard"
             element={
@@ -161,6 +185,7 @@ function AppRoutes() {
         </Routes>
       </main>
 
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
       <MainFooter />
     </>
   );
diff --git a/frontend/bitmatch/src/components/navbar.jsx b/frontend/bitmatch/src/components/navbar.jsx
index c37b4b5..90ff922 100644
--- a/frontend/bitmatch/src/components/navbar.jsx
+++ b/frontend/bitmatch/src/components/navbar.jsx
@@ -15,12 +15,18 @@ export default function Navbar({ links = [] }) {
   const { user } = useUser();
   const defaultLinks = [
     { href: "/about", label: "About" },
+<<<<<<< HEAD
+    { href: "/browse", label: "Browse" },
+    { href: "/contact", label: "Contact" },
+    { href: "/my-profile", label: "My Profile" },
+=======
     ...(user?.id
       ? [
           { href: "/project-list", label: "Browse" },
           { href: `/profile/${user.id}`, label: "My Profile" },
         ]
       : []),
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
   ];
 
   const [showModal, setShowModal] = useState(false);
diff --git a/frontend/bitmatch/src/components/onboarding/CreateProfile.jsx b/frontend/bitmatch/src/components/onboarding/CreateProfile.jsx
index 1feb700..32e014e 100644
--- a/frontend/bitmatch/src/components/onboarding/CreateProfile.jsx
+++ b/frontend/bitmatch/src/components/onboarding/CreateProfile.jsx
@@ -1,3 +1,56 @@
+<<<<<<< HEAD
+'use client'
+
+import {
+  forwardRef,
+  useEffect,
+  useState,
+  useImperativeHandle,
+} from 'react'
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Badge } from '@/components/ui/badge'
+import { X } from 'lucide-react'
+
+// ✅ Component with forwardRef
+const CreateProfile = forwardRef(({ onDataChange, formData }, ref) => {
+  const [firstName, setFirstName] = useState(formData?.first_name || '')
+  const [lastName, setLastName] = useState(formData?.last_name || '')
+  const [colleges, setColleges] = useState(formData?.colleges || [])
+  const [newCollege, setNewCollege] = useState('')
+  const [errors, setErrors] = useState({})
+
+  // Send data to parent on change
+  useEffect(() => {
+    onDataChange({ first_name: firstName, last_name: lastName, colleges })
+  }, [firstName, lastName, colleges])
+
+  // Validation logic exposed via ref
+  useImperativeHandle(ref, () => ({
+    validate: () => {
+      const newErrors = {}
+      if (!firstName.trim()) newErrors.firstName = 'First name is required.'
+      if (!lastName.trim()) newErrors.lastName = 'Last name is required.'
+      if (colleges.length === 0) newErrors.colleges = 'At least one college is required.'
+      setErrors(newErrors)
+      return Object.keys(newErrors).length === 0
+    },
+  }))
+
+  const handleAddCollege = () => {
+    const trimmed = newCollege.trim()
+    if (trimmed && !colleges.includes(trimmed)) {
+      const updated = [...colleges, trimmed].sort()
+      setColleges(updated)
+      setNewCollege('')
+    }
+  }
+
+  const handleRemoveCollege = (college) => {
+    const updated = colleges.filter((c) => c !== college).sort()
+    setColleges(updated)
+  }
+=======
 "use client";
 
 import { forwardRef, useEffect, useState, useImperativeHandle } from "react";
@@ -47,6 +100,7 @@ const CreateProfile = forwardRef(({ onDataChange, formData }, ref) => {
       return Object.keys(newErrors).length === 0;
     },
   }));
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
   return (
     <div className="space-y-6">
@@ -61,9 +115,13 @@ const CreateProfile = forwardRef(({ onDataChange, formData }, ref) => {
           onChange={(e) => setFirstName(e.target.value)}
           placeholder="Enter your first name"
         />
+<<<<<<< HEAD
+        {errors.firstName && <p className="text-red-500 text-sm">{errors.firstName}</p>}
+=======
         {errors.firstName && (
           <p className="text-red-500 text-sm">{errors.firstName}</p>
         )}
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
       </div>
 
       {/* Last Name */}
@@ -77,6 +135,55 @@ const CreateProfile = forwardRef(({ onDataChange, formData }, ref) => {
           onChange={(e) => setLastName(e.target.value)}
           placeholder="Enter your last name"
         />
+<<<<<<< HEAD
+        {errors.lastName && <p className="text-red-500 text-sm">{errors.lastName}</p>}
+      </div>
+
+      {/* Colleges */}
+      <div className="space-y-2">
+        <label className="text-sm font-medium">
+          Colleges/Universities <span className="text-red-500">*</span>
+        </label>
+        <div className="flex gap-2">
+          <Input
+            value={newCollege}
+            onChange={(e) => setNewCollege(e.target.value)}
+            placeholder="Add college or university"
+            onKeyDown={(e) => {
+              if (e.key === 'Enter') {
+                e.preventDefault()
+                handleAddCollege()
+              }
+            }}
+          />
+          <Button onClick={handleAddCollege} className="bg-blue-600 hover:bg-blue-700">
+            Add
+          </Button>
+        </div>
+
+        <div className="flex flex-wrap gap-2 py-2">
+          {colleges.map((college) => (
+            <Badge key={college} className="px-4 py-2 bg-blue-600 text-white">
+              {college}
+              <button
+                onClick={() => handleRemoveCollege(college)}
+                className="ml-1 hover:text-gray-200"
+              >
+                <X className="h-4 w-4" />
+              </button>
+            </Badge>
+          ))}
+        </div>
+
+        {errors.colleges && <p className="text-red-500 text-sm">{errors.colleges}</p>}
+      </div>
+    </div>
+  )
+})
+
+// ✅ Export wrapped with forwardRef
+export default CreateProfile
+=======
         {errors.lastName && (
           <p className="text-red-500 text-sm">{errors.lastName}</p>
         )}
@@ -158,3 +265,4 @@ const CreateProfile = forwardRef(({ onDataChange, formData }, ref) => {
 });
 
 export default CreateProfile;
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
diff --git a/frontend/bitmatch/src/components/onboarding/Interest.jsx b/frontend/bitmatch/src/components/onboarding/Interest.jsx
index c7e81ad..815b398 100644
--- a/frontend/bitmatch/src/components/onboarding/Interest.jsx
+++ b/frontend/bitmatch/src/components/onboarding/Interest.jsx
@@ -1,3 +1,49 @@
+<<<<<<< HEAD
+'use client'
+
+import {
+  forwardRef,
+  useEffect,
+  useState,
+  useImperativeHandle,
+} from 'react'
+import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { X } from 'lucide-react'
+
+const Interest = forwardRef(({ onDataChange, formData }, ref) => {
+  const [interests, setInterests] = useState(formData?.interests || [])
+  const [newInterest, setNewInterest] = useState('')
+  const [error, setError] = useState('')
+
+  useEffect(() => {
+    onDataChange({ interests })
+  }, [interests])
+
+  const validate = () => {
+    if (interests.length === 0) {
+      setError('Please add at least one interest.')
+      return false
+    }
+    setError('')
+    return true
+  }
+
+  useImperativeHandle(ref, () => ({ validate }))
+
+  const handleAdd = () => {
+    const trimmed = newInterest.trim()
+    if (trimmed && !interests.includes(trimmed)) {
+      setInterests([...interests, trimmed].sort())
+      setNewInterest('')
+      setError('')
+    }
+  }
+
+  const handleRemove = (interest) => {
+    setInterests(interests.filter((i) => i !== interest))
+  }
+=======
 "use client";
 
 import { forwardRef, useEffect, useState, useImperativeHandle } from "react";
@@ -37,12 +83,17 @@ const Interest = forwardRef(({ onDataChange, formData }, ref) => {
   const handleRemove = (interest) => {
     setInterests(interests.filter((i) => i !== interest));
   };
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
   return (
     <div className="space-y-4">
       <label className="text-sm font-medium">
+<<<<<<< HEAD
+        What categories are you most interested in? <span className="text-red-500">*</span>
+=======
         What categories/topics/hobbies are you most interested in?{" "}
         <span className="text-red-500">*</span>
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
       </label>
 
       <div className="flex space-x-2">
@@ -51,9 +102,15 @@ const Interest = forwardRef(({ onDataChange, formData }, ref) => {
           onChange={(e) => setNewInterest(e.target.value)}
           placeholder="Type a category"
           onKeyDown={(e) => {
+<<<<<<< HEAD
+            if (e.key === 'Enter') {
+              e.preventDefault()
+              handleAdd()
+=======
             if (e.key === "Enter") {
               e.preventDefault();
               handleAdd();
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
             }
           }}
         />
@@ -78,7 +135,14 @@ const Interest = forwardRef(({ onDataChange, formData }, ref) => {
         ))}
       </div>
     </div>
+<<<<<<< HEAD
+  )
+})
+
+export default Interest
+=======
   );
 });
 
 export default Interest;
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
diff --git a/frontend/bitmatch/src/components/onboarding/Location.jsx b/frontend/bitmatch/src/components/onboarding/Location.jsx
index 5e87e8e..d69dd8c 100644
--- a/frontend/bitmatch/src/components/onboarding/Location.jsx
+++ b/frontend/bitmatch/src/components/onboarding/Location.jsx
@@ -1,3 +1,22 @@
+<<<<<<< HEAD
+'use client'
+
+import {
+  forwardRef,
+  useEffect,
+  useState,
+  useImperativeHandle,
+} from 'react'
+import { Checkbox } from '@/components/ui/checkbox'
+
+const Location = forwardRef(({ onDataChange, formData }, ref) => {
+  const [location, setLocation] = useState(formData?.location || '')
+  const [preferences, setPreferences] = useState(
+    formData?.location_preferences?.filter(p => p !== '') || ["Remote friendly projects"]
+  )
+  const [other, setOther] = useState('')
+  const [errors, setErrors] = useState({})
+=======
 "use client";
 
 import { forwardRef, useEffect, useState, useImperativeHandle } from "react";
@@ -12,11 +31,40 @@ const Location = forwardRef(({ onDataChange, formData }, ref) => {
   );
   const [other, setOther] = useState("");
   const [errors, setErrors] = useState({});
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
   const options = [
     "Near my location",
     "Near my University or College location",
     "Remote friendly projects",
+<<<<<<< HEAD
+  ]
+
+  useEffect(() => {
+    const allPreferences = [...preferences, ...(other ? [other] : [])]
+    onDataChange({ location, location_preferences: allPreferences })
+  }, [location, preferences, other])
+
+  const validate = () => {
+    const newErrors = {}
+    if (!location.trim()) newErrors.location = 'Location is required.'
+    if (preferences.length === 0 && !other.trim()) {
+      newErrors.preferences = 'Please select or enter at least one preference.'
+    }
+    setErrors(newErrors)
+    return Object.keys(newErrors).length === 0
+  }
+
+  useImperativeHandle(ref, () => ({ validate }))
+
+  const togglePreference = (value) => {
+    setPreferences((prev) =>
+      prev.includes(value)
+        ? prev.filter((p) => p !== value)
+        : [...prev, value]
+    )
+  }
+=======
   ];
 
   useEffect(() => {
@@ -41,6 +89,7 @@ const Location = forwardRef(({ onDataChange, formData }, ref) => {
       prev.includes(value) ? prev.filter((p) => p !== value) : [...prev, value]
     );
   };
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
   return (
     <div className="space-y-6">
@@ -54,15 +103,23 @@ const Location = forwardRef(({ onDataChange, formData }, ref) => {
           onChange={(e) => setLocation(e.target.value)}
           placeholder="Enter your location"
         />
+<<<<<<< HEAD
+        {errors.location && <p className="text-red-500 text-sm">{errors.location}</p>}
+=======
         {errors.location && (
           <p className="text-red-500 text-sm">{errors.location}</p>
         )}
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
       </div>
 
       <div className="space-y-2">
         <label className="text-sm font-medium">
+<<<<<<< HEAD
+          Do you have a location preference for projects? <span className="text-red-500">*</span>
+=======
           Do you have a location preference for projects?{" "}
           <span className="text-red-500">*</span>
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
         </label>
 
         {options.map((option) => (
@@ -72,6 +129,29 @@ const Location = forwardRef(({ onDataChange, formData }, ref) => {
               checked={preferences.includes(option)}
               onCheckedChange={() => togglePreference(option)}
             />
+<<<<<<< HEAD
+            <label htmlFor={option} className="text-sm">{option}</label>
+          </div>
+        ))}
+
+        <div className="mt-4">
+          <label className="text-sm">Other</label>
+          <input
+            className="mt-1 block w-full border px-3 py-2 rounded"
+            value={other}
+            onChange={(e) => setOther(e.target.value)}
+            placeholder="Add custom preference"
+          />
+        </div>
+
+        {errors.preferences && <p className="text-red-500 text-sm">{errors.preferences}</p>}
+      </div>
+    </div>
+  )
+})
+
+export default Location
+=======
             <label htmlFor={option} className="text-sm">
               {option}
             </label>
@@ -87,3 +167,4 @@ const Location = forwardRef(({ onDataChange, formData }, ref) => {
 });
 
 export default Location;
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
diff --git a/frontend/bitmatch/src/components/project/EditProfileDialog.jsx b/frontend/bitmatch/src/components/project/EditProfileDialog.jsx
index 9ae73d8..6253b4f 100644
--- a/frontend/bitmatch/src/components/project/EditProfileDialog.jsx
+++ b/frontend/bitmatch/src/components/project/EditProfileDialog.jsx
@@ -1,5 +1,15 @@
 "use client";
 import { useState } from "react";
+<<<<<<< HEAD
+import { X, Plus, Edit2, Trash2, Mail, Phone, Globe } from "lucide-react";
+import { Button } from "@/components/ui/button";
+import {
+    Dialog,
+    DialogContent,
+    DialogHeader,
+    DialogTitle,
+    DialogFooter,
+=======
 import { X, Plus, Edit2, Trash2, Mail } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import {
@@ -8,12 +18,486 @@ import {
   DialogHeader,
   DialogTitle,
   DialogFooter,
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 } from "@/components/ui/Dialog";
 import { ScrollArea } from "@/components/ui/ScrollArea";
 import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/Label";
 import { Textarea } from "@/components/ui/Textarea";
 import { Card } from "@/components/ui/Card";
+<<<<<<< HEAD
+
+// Default dummy user data
+const DEFAULT_USER_DATA = {
+    name: "John Doe",
+    title: "Software Engineer",
+    bio: "Passionate about building great user experiences and scalable systems.",
+    email: "john.doe@example.com",
+    phone: "+1 (555) 123-4567",
+    website: "https://johndoe.dev",
+    skills: ["JavaScript", "React", "Node.js"],
+    experience: [
+        {
+            company: "Tech Corp",
+            position: "Senior Developer",
+            duration: "2020 - Present"
+        },
+        {
+            company: "Startup Inc",
+            position: "Frontend Developer",
+            duration: "2018 - 2020"
+        }
+    ],
+    education: [
+        {
+            institution: "State University",
+            degree: "B.S. Computer Science",
+            year: "2018"
+        }
+    ]
+};
+
+export function EditProfileDialog({ open, onOpenChange, onSave }) {
+    const [userData, setUserData] = useState(DEFAULT_USER_DATA);
+    const [newSkill, setNewSkill] = useState("");
+    const [editingSkillIndex, setEditingSkillIndex] = useState(-1);
+    const [newExperience, setNewExperience] = useState({ company: "", position: "", duration: "" });
+    const [editingExperienceIndex, setEditingExperienceIndex] = useState(-1);
+    const [newEducation, setNewEducation] = useState({ institution: "", degree: "", year: "" });
+    const [editingEducationIndex, setEditingEducationIndex] = useState(-1);
+
+    const handleChange = (field, value) => {
+        setUserData(prev => ({ ...prev, [field]: value }));
+    };
+
+    const handleSubmit = (e) => {
+        e.preventDefault();
+        // In a real app, you would call onSave with the updated data
+        console.log("Profile data to save:", userData);
+        onOpenChange(false);
+    };
+
+    // Skills management
+    const addSkill = () => {
+        if (!newSkill.trim()) return;
+
+        if (editingSkillIndex >= 0) {
+            const updatedSkills = [...userData.skills];
+            updatedSkills[editingSkillIndex] = newSkill;
+            setUserData(prev => ({ ...prev, skills: updatedSkills }));
+            setEditingSkillIndex(-1);
+        } else {
+            setUserData(prev => ({
+                ...prev,
+                skills: [...prev.skills, newSkill],
+            }));
+        }
+        setNewSkill("");
+    };
+
+    const removeSkill = (index) => {
+        const updatedSkills = userData.skills.filter((_, i) => i !== index);
+        setUserData(prev => ({ ...prev, skills: updatedSkills }));
+    };
+
+    const editSkill = (index) => {
+        setNewSkill(userData.skills[index]);
+        setEditingSkillIndex(index);
+    };
+
+    // Experience management
+    const addExperience = () => {
+        if (!newExperience.company.trim() || !newExperience.position.trim()) return;
+
+        if (editingExperienceIndex >= 0) {
+            const updatedExperiences = [...userData.experience];
+            updatedExperiences[editingExperienceIndex] = { ...newExperience };
+            setUserData(prev => ({ ...prev, experience: updatedExperiences }));
+            setEditingExperienceIndex(-1);
+        } else {
+            setUserData(prev => ({
+                ...prev,
+                experience: [...prev.experience, { ...newExperience }],
+            }));
+        }
+        setNewExperience({ company: "", position: "", duration: "" });
+    };
+
+    const removeExperience = (index) => {
+        const updatedExperiences = userData.experience.filter((_, i) => i !== index);
+        setUserData(prev => ({ ...prev, experience: updatedExperiences }));
+    };
+
+    const editExperience = (index) => {
+        setNewExperience({ ...userData.experience[index] });
+        setEditingExperienceIndex(index);
+    };
+
+    // Education management
+    const addEducation = () => {
+        if (!newEducation.institution.trim() || !newEducation.degree.trim()) return;
+
+        if (editingEducationIndex >= 0) {
+            const updatedEducation = [...userData.education];
+            updatedEducation[editingEducationIndex] = { ...newEducation };
+            setUserData(prev => ({ ...prev, education: updatedEducation }));
+            setEditingEducationIndex(-1);
+        } else {
+            setUserData(prev => ({
+                ...prev,
+                education: [...prev.education, { ...newEducation }],
+            }));
+        }
+        setNewEducation({ institution: "", degree: "", year: "" });
+    };
+
+    const removeEducation = (index) => {
+        const updatedEducation = userData.education.filter((_, i) => i !== index);
+        setUserData(prev => ({ ...prev, education: updatedEducation }));
+    };
+
+    const editEducation = (index) => {
+        setNewEducation({ ...userData.education[index] });
+        setEditingEducationIndex(index);
+    };
+
+    return (
+        <Dialog open={open} onOpenChange={onOpenChange}>
+            <DialogContent className="sm:max-w-[700px] max-h-[90vh] overflow-y-auto">
+                <DialogHeader>
+                    <div className="flex items-center justify-between">
+                        <DialogTitle className="text-xl font-bold">
+                            Edit Profile
+                        </DialogTitle>
+                        <Button
+                            variant="ghost"
+                            size="icon"
+                            onClick={() => onOpenChange(false)}
+                            className="h-8 w-8 rounded-full"
+                        >
+                            <X className="h-4 w-4" />
+                        </Button>
+                    </div>
+                    <p className="text-sm text-muted-foreground">
+                        Update your profile information.
+                    </p>
+                </DialogHeader>
+
+                <form onSubmit={handleSubmit} className="space-y-5 py-2">
+                    {/* Basic Info Section */}
+                    <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                        <div className="space-y-2">
+                            <Label htmlFor="name" className="text-sm font-medium">
+                                Full Name
+                            </Label>
+                            <Input
+                                id="name"
+                                value={userData.name}
+                                onChange={(e) => handleChange("name", e.target.value)}
+                                className="w-full"
+                                placeholder="Your full name"
+                            />
+                        </div>
+                        <div className="space-y-2">
+                            <Label htmlFor="title" className="text-sm font-medium">
+                                Professional Title
+                            </Label>
+                            <Input
+                                id="title"
+                                value={userData.title}
+                                onChange={(e) => handleChange("title", e.target.value)}
+                                className="w-full"
+                                placeholder="Your professional title"
+                            />
+                        </div>
+                    </div>
+
+                    <div className="space-y-2">
+                        <Label htmlFor="bio" className="text-sm font-medium">
+                            Bio
+                        </Label>
+                        <Textarea
+                            id="bio"
+                            value={userData.bio}
+                            onChange={(e) => handleChange("bio", e.target.value)}
+                            className="min-h-[100px] w-full"
+                            placeholder="Tell us about yourself"
+                        />
+                    </div>
+
+                    {/* Contact Info Section */}
+                    <div className="space-y-3 pt-2">
+                        <Label className="text-sm font-medium">Contact Information</Label>
+                        <Card className="p-4 space-y-3">
+                            <div className="flex items-center gap-3">
+                                <Mail className="h-4 w-4 text-muted-foreground" />
+                                <Input
+                                    value={userData.email}
+                                    onChange={(e) => handleChange("email", e.target.value)}
+                                    className="flex-1"
+                                    placeholder="Email address"
+                                />
+                            </div>
+                            <div className="flex items-center gap-3">
+                                <Phone className="h-4 w-4 text-muted-foreground" />
+                                <Input
+                                    value={userData.phone}
+                                    onChange={(e) => handleChange("phone", e.target.value)}
+                                    className="flex-1"
+                                    placeholder="Phone number"
+                                />
+                            </div>
+                            <div className="flex items-center gap-3">
+                                <Globe className="h-4 w-4 text-muted-foreground" />
+                                <Input
+                                    value={userData.website}
+                                    onChange={(e) => handleChange("website", e.target.value)}
+                                    className="flex-1"
+                                    placeholder="Website URL"
+                                />
+                            </div>
+                        </Card>
+                    </div>
+
+                    {/* Skills Section */}
+                    <div className="space-y-3 pt-2">
+                        <div className="flex items-center justify-between">
+                            <Label className="text-sm font-medium">Skills</Label>
+                        </div>
+                        <Card className="p-4">
+                            <div className="flex flex-col gap-4">
+                                <div className="flex gap-2">
+                                    <Input
+                                        placeholder="Add a skill"
+                                        value={newSkill}
+                                        onChange={(e) => setNewSkill(e.target.value)}
+                                        className="flex-1"
+                                    />
+                                    <Button
+                                        type="button"
+                                        onClick={addSkill}
+                                        variant="outline"
+                                        size="sm"
+                                    >
+                                        <Plus className="h-4 w-4 mr-2" />
+                                        {editingSkillIndex >= 0 ? "Update" : "Add"}
+                                    </Button>
+                                </div>
+
+                                {userData.skills.length > 0 && (
+                                    <ScrollArea className="h-[120px] pr-4">
+                                        <div className="space-y-2">
+                                            {userData.skills.map((skill, index) => (
+                                                <div
+                                                    key={index}
+                                                    className="flex items-center justify-between p-2 rounded-md bg-muted/50"
+                                                >
+                                                    <div className="flex-1">
+                                                        <p className="font-medium">{skill}</p>
+                                                    </div>
+                                                    <div className="flex items-center gap-1">
+                                                        <Button
+                                                            variant="ghost"
+                                                            size="icon"
+                                                            onClick={() => editSkill(index)}
+                                                            className="h-7 w-7"
+                                                            type="button"
+                                                        >
+                                                            <Edit2 className="h-3.5 w-3.5" />
+                                                        </Button>
+                                                        <Button
+                                                            variant="ghost"
+                                                            size="icon"
+                                                            onClick={() => removeSkill(index)}
+                                                            className="h-7 w-7 text-destructive"
+                                                            type="button"
+                                                        >
+                                                            <Trash2 className="h-3.5 w-3.5" />
+                                                        </Button>
+                                                    </div>
+                                                </div>
+                                            ))}
+                                        </div>
+                                    </ScrollArea>
+                                )}
+                            </div>
+                        </Card>
+                    </div>
+
+                    {/* Experience Section */}
+                    <div className="space-y-3 pt-2">
+                        <div className="flex items-center justify-between">
+                            <Label className="text-sm font-medium">Work Experience</Label>
+                        </div>
+                        <Card className="p-4">
+                            <div className="flex flex-col gap-4">
+                                <div className="grid grid-cols-1 md:grid-cols-3 gap-2">
+                                    <Input
+                                        placeholder="Company"
+                                        value={newExperience.company}
+                                        onChange={(e) => setNewExperience({ ...newExperience, company: e.target.value })}
+                                    />
+                                    <Input
+                                        placeholder="Position"
+                                        value={newExperience.position}
+                                        onChange={(e) => setNewExperience({ ...newExperience, position: e.target.value })}
+                                    />
+                                    <Input
+                                        placeholder="Duration (e.g. 2020 - Present)"
+                                        value={newExperience.duration}
+                                        onChange={(e) => setNewExperience({ ...newExperience, duration: e.target.value })}
+                                    />
+                                </div>
+                                <Button
+                                    type="button"
+                                    onClick={addExperience}
+                                    className="w-full"
+                                    variant="outline"
+                                    size="sm"
+                                >
+                                    <Plus className="h-4 w-4 mr-2" />
+                                    {editingExperienceIndex >= 0 ? "Update Experience" : "Add Experience"}
+                                </Button>
+
+                                {userData.experience.length > 0 && (
+                                    <ScrollArea className="h-[150px] pr-4">
+                                        <div className="space-y-2">
+                                            {userData.experience.map((exp, index) => (
+                                                <div
+                                                    key={index}
+                                                    className="flex flex-col p-3 rounded-md bg-muted/50"
+                                                >
+                                                    <div className="flex justify-between items-start">
+                                                        <div>
+                                                            <p className="font-medium">{exp.position}</p>
+                                                            <p className="text-sm">{exp.company}</p>
+                                                        </div>
+                                                        <div className="flex items-center gap-1">
+                                                            <Button
+                                                                variant="ghost"
+                                                                size="icon"
+                                                                onClick={() => editExperience(index)}
+                                                                className="h-7 w-7"
+                                                                type="button"
+                                                            >
+                                                                <Edit2 className="h-3.5 w-3.5" />
+                                                            </Button>
+                                                            <Button
+                                                                variant="ghost"
+                                                                size="icon"
+                                                                onClick={() => removeExperience(index)}
+                                                                className="h-7 w-7 text-destructive"
+                                                                type="button"
+                                                            >
+                                                                <Trash2 className="h-3.5 w-3.5" />
+                                                            </Button>
+                                                        </div>
+                                                    </div>
+                                                    <p className="text-sm text-muted-foreground mt-1">{exp.duration}</p>
+                                                </div>
+                                            ))}
+                                        </div>
+                                    </ScrollArea>
+                                )}
+                            </div>
+                        </Card>
+                    </div>
+
+                    {/* Education Section */}
+                    <div className="space-y-3 pt-2">
+                        <div className="flex items-center justify-between">
+                            <Label className="text-sm font-medium">Education</Label>
+                        </div>
+                        <Card className="p-4">
+                            <div className="flex flex-col gap-4">
+                                <div className="grid grid-cols-1 md:grid-cols-3 gap-2">
+                                    <Input
+                                        placeholder="Institution"
+                                        value={newEducation.institution}
+                                        onChange={(e) => setNewEducation({ ...newEducation, institution: e.target.value })}
+                                    />
+                                    <Input
+                                        placeholder="Degree"
+                                        value={newEducation.degree}
+                                        onChange={(e) => setNewEducation({ ...newEducation, degree: e.target.value })}
+                                    />
+                                    <Input
+                                        placeholder="Year"
+                                        value={newEducation.year}
+                                        onChange={(e) => setNewEducation({ ...newEducation, year: e.target.value })}
+                                    />
+                                </div>
+                                <Button
+                                    type="button"
+                                    onClick={addEducation}
+                                    className="w-full"
+                                    variant="outline"
+                                    size="sm"
+                                >
+                                    <Plus className="h-4 w-4 mr-2" />
+                                    {editingEducationIndex >= 0 ? "Update Education" : "Add Education"}
+                                </Button>
+
+                                {userData.education.length > 0 && (
+                                    <ScrollArea className="h-[120px] pr-4">
+                                        <div className="space-y-2">
+                                            {userData.education.map((edu, index) => (
+                                                <div
+                                                    key={index}
+                                                    className="flex flex-col p-3 rounded-md bg-muted/50"
+                                                >
+                                                    <div className="flex justify-between items-start">
+                                                        <div>
+                                                            <p className="font-medium">{edu.degree}</p>
+                                                            <p className="text-sm">{edu.institution}</p>
+                                                        </div>
+                                                        <div className="flex items-center gap-1">
+                                                            <Button
+                                                                variant="ghost"
+                                                                size="icon"
+                                                                onClick={() => editEducation(index)}
+                                                                className="h-7 w-7"
+                                                                type="button"
+                                                            >
+                                                                <Edit2 className="h-3.5 w-3.5" />
+                                                            </Button>
+                                                            <Button
+                                                                variant="ghost"
+                                                                size="icon"
+                                                                onClick={() => removeEducation(index)}
+                                                                className="h-7 w-7 text-destructive"
+                                                                type="button"
+                                                            >
+                                                                <Trash2 className="h-3.5 w-3.5" />
+                                                            </Button>
+                                                        </div>
+                                                    </div>
+                                                    <p className="text-sm text-muted-foreground mt-1">{edu.year}</p>
+                                                </div>
+                                            ))}
+                                        </div>
+                                    </ScrollArea>
+                                )}
+                            </div>
+                        </Card>
+                    </div>
+
+                    <DialogFooter className="pt-2">
+                        <Button
+                            variant="outline"
+                            type="button"
+                            onClick={() => onOpenChange(false)}
+                        >
+                            Cancel
+                        </Button>
+                        <Button type="submit">Save Changes</Button>
+                    </DialogFooter>
+                </form>
+            </DialogContent>
+        </Dialog>
+    );
+}
+=======
 import PropTypes from "prop-types";
 const SERVER_HOST = import.meta.env.VITE_SERVER_HOST;
 
@@ -434,3 +918,4 @@ EditProfileDialog.propTypes = {
   onSave: PropTypes.func.isRequired,
   profile: PropTypes.object.isRequired,
 };
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
diff --git a/frontend/bitmatch/src/views/HomePage.jsx b/frontend/bitmatch/src/views/HomePage.jsx
index 3cd1f4c..038418f 100644
--- a/frontend/bitmatch/src/views/HomePage.jsx
+++ b/frontend/bitmatch/src/views/HomePage.jsx
@@ -4,7 +4,10 @@ import ImageSlideshow from "../components/ui/ImageSlideshow";
 import ProjectCarousel from "../components/ui/ProjectCarousel";
 import { useNavigate } from "react-router-dom";
 import { useUser } from "@clerk/clerk-react";
+<<<<<<< HEAD
+=======
 import { calculateMatchScores } from "./MatchScoreUtils";
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
 const SERVER_HOST = import.meta.env.VITE_SERVER_HOST;
 
diff --git a/frontend/bitmatch/src/views/IndividualProjectPage.jsx b/frontend/bitmatch/src/views/IndividualProjectPage.jsx
index 3d3ffcb..ec2ce26 100644
--- a/frontend/bitmatch/src/views/IndividualProjectPage.jsx
+++ b/frontend/bitmatch/src/views/IndividualProjectPage.jsx
@@ -61,6 +61,13 @@ const ProjectDetailPage = () => {
   const [currentImageIndex, setCurrentImageIndex] = useState(0);
   const [isOpen, setIsOpen] = useState(false);
   const [activeTab, setActiveTab] = useState("overview");
+<<<<<<< HEAD
+  const [discussions, setDiscussions] = useState([]);
+  const [showCommentForm, setShowCommentForm] = useState(false);
+  const [replyingTo, setReplyingTo] = useState(null);
+  const [following, setFollowing ] = useState(false);
+  const [likeStatus, setLiked] = useState(false); 
+=======
   const [following, setFollowing] = useState(false);
   const [likeStatus, setLiked] = useState(false);
   const [userUuid, setUserUuid] = useState(null);
@@ -69,6 +76,7 @@ const ProjectDetailPage = () => {
   const [isReady, setIsReady] = useState(false);
   const [ownerData, setOwnerData] = useState(null);
   const [memberData, setMemberData] = useState([]);
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
   useEffect(() => {
     const fetchData = async () => {
@@ -384,6 +392,46 @@ const ProjectDetailPage = () => {
     }
   };
 
+  const handleFollow = async () => {
+    setFollowing(!following);
+    console.log("current following status:", following)
+    const fdata = {
+      "action": following ? "unfollow" : "follow",
+      "user_id" : 1
+    };
+    console.log("id is ", id)
+  
+    try {
+      const response = await axios.post(
+        `${SERVER_HOST}/projects/follow/${id}`, fdata, 
+      )
+      console.log("response: ", response.data);
+      window.location.reload();
+    } catch (error) {
+      console.error('Error updating follows: ', error);
+    }
+  };
+
+  const handleLike = async () => {
+    setLiked(!likeStatus);
+    console.log("current like status:", likeStatus)
+    const fdata = {
+      "action": likeStatus ? "unlike" : "like",
+      "user_id" : 1
+    };
+    console.log("id is ", id)
+  
+    try {
+      const response = await axios.post(
+        `${SERVER_HOST}/projects/like/${id}`, fdata, 
+      )
+      console.log("response: ", response.data);
+      window.location.reload();
+    } catch (error) {
+      console.error('Error updating likes: ', error);
+    }
+  };
+
   const handleSave = async (data) => {
     const formData = new FormData();
 
diff --git a/frontend/bitmatch/src/views/ProfilePage.jsx b/frontend/bitmatch/src/views/ProfilePage.jsx
index ad0e1e7..dcb1372 100644
--- a/frontend/bitmatch/src/views/ProfilePage.jsx
+++ b/frontend/bitmatch/src/views/ProfilePage.jsx
@@ -1,10 +1,220 @@
+<<<<<<< HEAD
+"use client"
+
+import { useState } from "react";
+=======
 "use client";
 
 import { useState, useEffect } from "react";
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 import { ChevronLeft, ChevronRight, GraduationCap } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Badge } from "@/components/ui/badge";
 import { EditProfileDialog } from "@/components/project/EditProfileDialog";
+<<<<<<< HEAD
+
+export default function StudentProfile() {
+    const [following, setFollowing] = useState(false);
+    const [loading, setLoading] = useState(true); // State to handle loading state
+    const [isOpen, setIsOpen] = useState(false);
+
+
+    /* if (loading) {
+        return (
+          <div className="flex justify-center items-center h-screen">
+            <div className="animate-spin rounded-full h-16 w-16 border-t-4 border-blue-500 border-solid"></div>
+          </div>
+        );
+      }
+    
+      // Error state
+      if (error) {
+        return (
+          <div className="flex justify-center items-center h-screen">
+            <p className="text-red-500">{error}</p>
+          </div>
+        );
+      }
+    
+      if (!project) {
+        return <div className="p-8 text-center">No project found.</div>;
+      }
+        */
+
+    return (
+        <div className="flex flex-col min-h-screen">
+            {/* Main Content */}
+            <main className="flex-1 max-w-4xl mx-auto w-full p-4">
+                {/* Profile Section */}
+                <div className="mb-4 border rounded-lg overflow-hidden">
+                    {/* Background Image */}
+                    <div className="h-48 bg-black flex items-center justify-center text-white">Background Image</div>
+
+                    <div className="px-6 pb-6 relative">
+                        {/* Profile Image */}
+                        <div className="w-32 h-32 bg-gray-100 rounded-full absolute -top-16 flex items-center justify-center border-4 border-white">
+                            Img Profile
+                        </div>
+
+                        <div className="flex justify-end pt-4 mb-4">
+                            <Button variant="outline" size="sm" className="text-xs" 
+                            onClick={(e) => {
+                                setIsOpen(true);
+                                e.preventDefault();
+                            }}>
+                                Edit Profile
+                            </Button>
+                            <EditProfileDialog
+                                          open={isOpen}
+                                          onOpenChange={setIsOpen}
+                                          
+                                    
+                                        />
+                        </div>
+
+                        <div className="ml-36">
+                            <h2 className="text-2xl font-bold">Student's Name</h2>
+                            <p className="text-gray-600">Position Title Preference</p>
+                            <p className="text-gray-600 text-sm mt-1">Name of University or College</p>
+                            <p className="text-gray-600 text-sm">Student's Major</p>
+
+                            <div className="flex items-center gap-4 mt-4">
+                                <div className="flex items-center gap-1">
+                                    <div className="w-3 h-3 bg-gray-200 rounded-full"></div>
+                                    <span className="text-sm">2,000,000 Followers</span>
+                                </div>
+                                <Button
+                                    variant={following ? "default" : "outline"}
+                                    size="sm"
+                                    className="text-xs"
+                                    onClick={() => setFollowing(!following)}
+                                >
+                                    {following ? "Following" : "Follow Student"}
+                                </Button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                {/* About Section */}
+                <div className="mb-4 border rounded-lg p-6">
+                    <h3 className="text-xl font-bold mb-4">About</h3>
+                    <p className="text-sm text-gray-600">
+                        Summary of the Student. A small description of the student can be typed here. It won't be very long.
+                        Standard dummy text. A small description of the Student can be typed here. It won't be very long. Standard
+                        dummy text, standard dummy text. Summary of the Student. A small description of the student can be typed
+                        here. It won't be very long. Standard standard dummy text. A small description of the Student can be typed
+                        here. It won't be very long. Standard dummy text, text, standard dummy text. Summary of the Student. A small
+                        description of the student can be typed here. It won't be very long. Standard dummy text, standard dummy
+                        text.
+                    </p>
+                </div>
+
+                {/* Current Projects */}
+                <div className="mb-8 border rounded-lg p-6">
+                    <h3 className="text-xl font-bold mb-4">Current Projects</h3>
+
+                    <div className="relative">
+                        <div className="flex gap-4 overflow-hidden">
+                            {[1, 2, 3].map((project) => (
+                                <div key={project} className="w-1/3 flex-shrink-0">
+                                    <div className="bg-gray-200 h-32 mb-2 rounded"></div>
+                                    <p className="text-sm">The Name of the Project will go here. The Name of the Project will go here</p>
+                                </div>
+                            ))}
+                        </div>
+
+                        <button className="absolute left-0 top-1/2 -translate-y-1/2 w-8 h-8 bg-white rounded-full shadow flex items-center justify-center">
+                            <ChevronLeft size={20} />
+                        </button>
+                        <button className="absolute right-0 top-1/2 -translate-y-1/2 w-8 h-8 bg-white rounded-full shadow flex items-center justify-center">
+                            <ChevronRight size={20} />
+                        </button>
+                    </div>
+                </div>
+
+                {/* Education */}
+                <div className="mb-4 border rounded-lg p-6 relative">
+                    <h3 className="text-xl font-bold mb-4">Education</h3>
+                    <Button variant="outline" size="sm" className="absolute top-6 right-6 text-xs">
+                        Edit Icon
+                    </Button>
+
+                    <div className="space-y-6">
+                        <div className="flex gap-4">
+                            <div className="w-12 h-12 bg-gray-100 rounded-lg flex items-center justify-center">
+                                <GraduationCap className="text-gray-500" />
+                            </div>
+                            <div>
+                                <h4 className="font-medium">California State Polytechnic University, Pomona - May 2026</h4>
+                                <p className="text-sm text-gray-600">BA, Computer Science</p>
+                            </div>
+                        </div>
+
+                        <div className="flex gap-4">
+                            <div className="w-12 h-12 bg-gray-100 rounded-lg flex items-center justify-center">
+                                <GraduationCap className="text-gray-500" />
+                            </div>
+                            <div>
+                                <h4 className="font-medium">Citrus College, Glendora - May 2023</h4>
+                                <p className="text-sm text-gray-600">AS-T, Computer Science</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                {/* Positions that Interest Me */}
+                <div className="mb-4 border rounded-lg p-6 relative">
+                    <h3 className="text-xl font-bold mb-4">Positions that Interest Me</h3>
+                    <Button variant="outline" size="sm" className="absolute top-6 right-6 text-xs">
+                        Edit Icon
+                    </Button>
+
+                    <div className="flex flex-wrap gap-2">
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            Front-End Development
+                        </Badge>
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            Full-stack Development
+                        </Badge>
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            Backend Development
+                        </Badge>
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            Data Engineer
+                        </Badge>
+                    </div>
+                </div>
+
+                {/* Skills */}
+                <div className="mb-4 border rounded-lg p-6 relative">
+                    <h3 className="text-xl font-bold mb-4">Skills</h3>
+                    <Button variant="outline" size="sm" className="absolute top-6 right-6 text-xs">
+                        Edit Icon
+                    </Button>
+
+                    <div className="flex flex-wrap gap-2 mb-2">
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            Python
+                        </Badge>
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            HTML
+                        </Badge>
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            CSS
+                        </Badge>
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            Analytical
+                        </Badge>
+                        <Badge variant="outline" className="bg-gray-400 hover:bg-black">
+                            Communication Skills
+                        </Badge>
+                    </div>
+                </div>
+            </main>
+        </div>
+    )
+=======
 import { useParams } from "react-router-dom";
 import { useUser } from "@clerk/clerk-react";
 import { Link } from "react-router-dom";
@@ -279,4 +489,5 @@ export default function StudentProfile() {
       </main>
     </div>
   );
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 }
diff --git a/frontend/bitmatch/src/views/ProjectListPage.jsx b/frontend/bitmatch/src/views/ProjectListPage.jsx
index f577a6a..59184a7 100644
--- a/frontend/bitmatch/src/views/ProjectListPage.jsx
+++ b/frontend/bitmatch/src/views/ProjectListPage.jsx
@@ -6,7 +6,10 @@ const SERVER_HOST = import.meta.env.VITE_SERVER_HOST;
 import axios from "axios";
 import { useNavigate } from "react-router-dom";
 import { useUser } from "@clerk/clerk-react";
+<<<<<<< HEAD
+=======
 import { calculateMatchScores } from "./MatchScoreUtils";
+>>>>>>> d273cc17c82f58fa65fb0d6a01dc2146af9a0b84
 
 export default function ProjectListPage() {
   const navigate = useNavigate();