fix: issue in user profile

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