diff --git a/src/Components/ValidationField/View/File.tsx b/src/Components/ValidationField/View/File.tsx
index 56b392e..974985d 100644
--- a/src/Components/ValidationField/View/File.tsx
+++ b/src/Components/ValidationField/View/File.tsx
@@ -1,16 +1,9 @@
-<<<<<<< HEAD
 import { Button, Upload, UploadFile } from 'antd'
 import useFormField from '../../../Hooks/useFormField';
 import { UploadOutlined } from '@ant-design/icons';
 import { BaseURL, BaseURL_IMAGE } from '../../../api/config';
 import { useTranslation } from 'react-i18next';
 import { ErrorMessage } from 'formik';
-=======
-import { Button, Upload, UploadFile } from "antd";
-import useFormField from "../../../Hooks/useFormField";
-import React, { useMemo } from "react";
-import { FaUpload } from "react-icons/fa";
->>>>>>> c6ee1f60784e6dd9e87132499ccbeb09ece51f63
 
 
 const File = ({ name, label, onChange, isDisabled, accept, props }: any) => {
@@ -50,26 +43,6 @@ const File = ({ name, label, onChange, isDisabled, accept, props }: any) => {
         defaultFileList={[...fileList]}
         onChange={onChange || FilehandleChange}
         customRequest={customRequest}
-<<<<<<< HEAD
-=======
-        className={` w-100`}
-        id={name}
-      >
-        <Button
-          className={isError ? "isError w-100 " : " w-100"}
-          icon={<FaUpload />}
-        >
-          {placeholder
-            ? t(`input.${placeholder}`)
-            : t("input.Click_to_upload_the_image")}
-        </Button>
-        <div className="Error_color"> {isError ? "required" : ""}</div>
-        {errorMsg}
-      </Upload>
-    </div>
-  );
-};
->>>>>>> c6ee1f60784e6dd9e87132499ccbeb09ece51f63
 
       >
         <Button className='w-100' icon={<UploadOutlined />}>{t("upload_image")}</Button>
diff --git a/src/Hooks/useFormField.tsx b/src/Hooks/useFormField.tsx
index 2e601c2..74303a6 100644
--- a/src/Hooks/useFormField.tsx
+++ b/src/Hooks/useFormField.tsx
@@ -1,7 +1,6 @@
 import { useField, useFormikContext } from "formik";
 import { useTranslation } from "react-i18next";
 import { Field } from "formik";
-import { useValidationState } from "../Components/ValidationField/utils/ValidationState";
 import { useEffect } from "react";
 
 const useFormField = (name: string, props?: any) => {
@@ -9,15 +8,11 @@ const useFormField = (name: string, props?: any) => {
   const { t } = useTranslation();
   const formik = useFormikContext<any>();
 
-  const { Validation, setValidation } = useValidationState((state) => state);
 
-  const isError = !!((meta.touched && meta.error) || Validation[name as any]);
+  const isError = !!((meta.touched && meta.error));
 
 
-  const errorMsg =
-    !!isError && meta.error
-      ? t(meta.error.toString())
-      : t(Validation[name as any]) ?? "";
+  const errorMsg = !!isError && meta.error && t(meta.error.toString());
 
   return { Field, field, meta, formik, isError, errorMsg, t };
 };