diff --git a/src/App.tsx b/src/App.tsx
index 43fe290..3c17e69 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -9,7 +9,10 @@ import {
 import './App.css';
 import { useTranslation } from 'react-i18next';
 import { LanguageManager } from './components/LanguageManager';
+<<<<<<< HEAD
 
+=======
+>>>>>>> f1620b6 (fix: issue in user profile)
 function App() {
   const { t } = useTranslation();