diff --git a/src/app/profileScreen/page.tsx b/src/app/profileScreen/page.tsx
index 3e370b18..59174e45 100644
--- a/src/app/profileScreen/page.tsx
+++ b/src/app/profileScreen/page.tsx
@@ -1,12 +1,3 @@
-<<<<<<< HEAD
-export default function Profile() {
-  return (
-    <main>
-      <div>Profile</div>
-    </main>
-  );
-}
-=======
 'use client';
 import { LogOutButton, GlobalStyle } from './style';
 import { createClient } from '@supabase/supabase-js';
@@ -27,4 +18,4 @@ async function signOut() {
   );
   const { error } = await supabase.auth.signOut();
 }
->>>>>>> 22db8ee (refactor:changed folder name)
+