Fixed merge conflict

src/components/Cards/ProfileCard/EditProfile/PIBField/PIBField.js

@@ -19,11 +19,7 @@ const PIBField = (props) => {
         error={props.formik.touched.firmPIB && props.formik.errors.firmPIB}
         margin="normal"
         fullWidth
-<<<<<<< HEAD
         disabled={!props.isAdmin}
-=======
-        // disabled
->>>>>>> 7c00f1e951b91c197b9f517e6e795cd4a821e12f
       />
     </>
   );