diff --git a/src/App.tsx b/src/App.tsx
index 3c17e69..3533cc8 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -7,16 +7,25 @@ import {
   useColorScheme,
 } from '@mui/material';
 import './App.css';
+<<<<<<< HEAD
 import { useTranslation } from 'react-i18next';
 import { LanguageManager } from './components/LanguageManager';
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 >>>>>>> f1620b6 (fix: issue in user profile)
+=======
+=======
+import { UserProfileForm } from './features/profile/components/UserProfileForm';
+
+>>>>>>> 3698cbf (feat: implement user profile form)
+>>>>>>> f9815fb (fix: issue in user profile)
 function App() {
   const { t } = useTranslation();
 
   return (
+<<<<<<< HEAD
     <>
       <CssBaseline />
       <LanguageManager />
@@ -45,6 +54,11 @@ function App() {
         </Box>
       </div>
     </>
+=======
+    <div>
+      <UserProfileForm />
+    </div>
+>>>>>>> 3698cbf (feat: implement user profile form)
   );
 }
 
diff --git a/src/features/profile/components/UserProfileForm.tsx b/src/features/profile/components/UserProfileForm.tsx
index bd48a23..b1f711b 100644
--- a/src/features/profile/components/UserProfileForm.tsx
+++ b/src/features/profile/components/UserProfileForm.tsx
@@ -108,12 +108,16 @@ export function UserProfileForm() {
         <Grid container spacing={0.5}>
           <Grid item xs={12} sm={6}>
             <Box sx={{ mb: 2 }}>
+<<<<<<< HEAD
               <Typography
                 variant="subtitle2"
                 sx={{ color: 'gray', fontSize: '14px', ml: '34vh' }}
               >
                 نام
               </Typography>
+=======
+              <Typography variant="subtitle2">نام</Typography>
+>>>>>>> f9815fb (fix: issue in user profile)
               {isEditing ? (
                 <TextField
                   fullWidth
@@ -125,9 +129,12 @@ export function UserProfileForm() {
                   inputProps={{
                     sx: {
                       height: '12px',
+<<<<<<< HEAD
                       fontSize: '16px',
                       fontWeight: 'bold',
                       direction: 'rtl',
+=======
+>>>>>>> f9815fb (fix: issue in user profile)
                     },
                   }}
                 />
@@ -139,12 +146,16 @@ export function UserProfileForm() {
             </Box>
 
             <Box>
+<<<<<<< HEAD
               <Typography
                 variant="subtitle2"
                 sx={{ color: 'gray', fontSize: '14px' }}
               >
                 جنسیت
               </Typography>
+=======
+              <Typography variant="subtitle2">جنسیت</Typography>
+>>>>>>> f9815fb (fix: issue in user profile)
               {isEditing ? (
                 <FormControl sx={{ width: '230px' }}>
                   <InputLabel id="sex-label">جنسیت</InputLabel>
@@ -175,10 +186,14 @@ export function UserProfileForm() {
 
           <Grid item xs={12} sm={6}>
             <Box sx={{ mb: 2 }}>
+<<<<<<< HEAD
               <Typography
                 variant="subtitle2"
                 sx={{ color: 'gray', fontSize: '14px' }}
               >
+=======
+              <Typography variant="subtitle2" sx={{ width: '230px' }}>
+>>>>>>> f9815fb (fix: issue in user profile)
                 نام خانوادگی
               </Typography>
               {isEditing ? (
@@ -203,12 +218,16 @@ export function UserProfileForm() {
             </Box>
 
             <Box>
+<<<<<<< HEAD
               <Typography
                 variant="subtitle2"
                 sx={{ color: 'gray', fontSize: '14px' }}
               >
                 کد ملی
               </Typography>
+=======
+              <Typography variant="subtitle2">کد ملی</Typography>
+>>>>>>> f9815fb (fix: issue in user profile)
               {isEditing ? (
                 <TextField
                   fullWidth