resolve conflicts

Author: rsergeenko

redisinsight/ui/src/pages/browser/components/add-key/AddKeyReJSON/AddKeyReJSON.tsx

@@ -103,7 +103,7 @@ const AddKeyReJSON = (props: Props) => {
           />
           <EuiFlexGroup justifyContent="flexEnd">
             <EuiFlexItem grow={false}>
-              <UploadFile onClick={onClick} onFileChange={onFileChange} />
+              <UploadFile onClick={onClick} onFileChange={onFileChange} accept="application/json, text/plain" />
             </EuiFlexItem>
           </EuiFlexGroup>
         </>

redisinsight/ui/src/pages/workbench/components/enablement-area/EnablementArea/components/UploadTutorialForm/UploadTutorialForm.tsx

@@ -7,7 +7,7 @@ import { isEmpty } from 'lodash'
 import cx from 'classnames'
 import { Nullable } from 'uiSrc/utils'
 import validationErrors from 'uiSrc/constants/validationErrors'
-import UploadFile from 'uiSrc/components/uploadFile'
+import UploadFile from 'uiSrc/components/upload-file'
 
 import styles from './styles.module.scss'