diff --git a/src/App.tsx b/src/App.tsx
index 73b994d..b2b7076 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -7,18 +7,12 @@ import {
   useColorScheme,
 } from '@mui/material';
 import './App.css';
-<<<<<<< HEAD
 import { useTranslation } from 'react-i18next';
 import { LanguageManager } from './components/LanguageManager';
-=======
-import { UserProfileForm } from './features/profile/components/UserProfileForm';
-
->>>>>>> 3698cbf (feat: implement user profile form)
 function App() {
   const { t } = useTranslation();
 
   return (
-<<<<<<< HEAD
     <>
       <CssBaseline />
       <LanguageManager />
@@ -47,11 +41,6 @@ function App() {
         </Box>
       </div>
     </>
-=======
-    <div>
-      <UserProfileForm />
-    </div>
->>>>>>> 3698cbf (feat: implement user profile form)
   );
 }