Merge pull request #54780 from nextcloud/backport/54738/stable31

Author: provokateurin

apps/files/src/services/DropServiceUtils.ts

@@ -158,7 +158,7 @@ export const resolveConflict = async <T extends ((Directory|File)|Node)>(files:
 		logger.debug('Conflict resolution', { uploads, selected, renamed })
 
 		// If the user selected nothing, we cancel the upload
-		if (selected.length === 0 && renamed.length === 0) {
+		if (selected.length === 0 && renamed.length === 0 && uploads.length === 0) {
 			// User skipped
 			showInfo(t('files', 'Conflicts resolution skipped'))
 			logger.info('User skipped the conflict resolution')