resolved conflict.

frontend/src/file/components/UploadFile.tsx

@@ -1,4 +1,4 @@
-import { useUploadFileMutation, File } from '../../gql'
+import { useUploadFileMutation, File, FilesDocument } from '../../gql'
 import { useForm, TextInput } from '../../form'
 import { customEvent } from '../../lib/customEvent'