merge conflicts

Feature #13988

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

diff --cc src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
index 3ad753fc92802cac6383167210d68bc605188e05,39d565938da85f8df779ed03c76f0406304b3150..a1057b43ce72075eeccad4baebfd7c320a6eaa57
--- 1/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
--- 2/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
+++ b/src/store/collection-panel/collection-panel-files/collection-panel-files-actions.ts
@@@ -11,9 -11,10 +11,10 @@@ import { snackbarActions } from "../../
  import { dialogActions } from '../../dialog/dialog-actions';
  import { getNodeValue } from "~/models/tree";
  import { filterCollectionFilesBySelection } from './collection-panel-files-state';
- import { startSubmit, initialize, stopSubmit } from 'redux-form';
 -import { startSubmit, initialize, SubmissionError, stopSubmit, reset } from 'redux-form';
 -import { loadProjectTreePickerProjects } from '../../../views-components/project-tree-picker/project-tree-picker';
++import { startSubmit, initialize, stopSubmit, reset } from 'redux-form';
  import { getCommonResourceServiceError, CommonResourceServiceError } from "~/common/api/common-resource-service";
 +import { resetPickerProjectTree } from '../../project-tree-picker/project-tree-picker-actions';
+ import { getDialog } from "~/store/dialog/dialog-reducer";
  
  export const collectionPanelFilesAction = unionize({
      SET_COLLECTION_FILES: ofType<CollectionFilesTree>(),