[stable30] fix(files): Fix having to resolve conflicts twice when dropping files

[stable30] fix(files): Fix having to resolve conflicts twice when dropping files #61885