Import missing dependencies after rebasing

Author: abelgardep

owncloudApp/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.kt

@@ -434,7 +434,7 @@ class FileDataStorageManager : KoinComponent {
 //        }
 //    }
 
-    // FIXME: 13/10/2020 : New_arch: Conflicts
+    // TODO: To be removed
     fun saveConflict(file: OCFile, eTagInConflictFromParameter: String?) {
 //        var eTagInConflict = eTagInConflictFromParameter
 //        if (!file.isDown) {

owncloudApp/src/main/java/com/owncloud/android/presentation/viewmodels/conflicts/ConflictsResolveViewModel.kt

@@ -23,10 +23,14 @@ package com.owncloud.android.presentation.viewmodels.conflicts
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.owncloud.android.domain.files.model.OCFile
+import com.owncloud.android.domain.files.usecases.GetFileByIdAsStreamUseCase
 import com.owncloud.android.providers.CoroutinesDispatcherProvider
 import com.owncloud.android.usecases.transfers.downloads.DownloadFileUseCase
 import com.owncloud.android.usecases.transfers.uploads.UploadFileInConflictUseCase
 import com.owncloud.android.usecases.transfers.uploads.UploadFilesFromSystemUseCase
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 
 class ConflictsResolveViewModel(