diff --git a/src/App.tsx b/src/App.tsx
index b6dffad..b2b7076 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -7,12 +7,8 @@ import {
   useColorScheme,
 } from '@mui/material';
 import './App.css';
-<<<<<<< HEAD
 import { useTranslation } from 'react-i18next';
 import { LanguageManager } from './components/LanguageManager';
-
-=======
->>>>>>> 58445fe (feat: add user profile which includes three sections: Personal Information, Phone Number and Email and Social media)
 function App() {
   const { t } = useTranslation();