Fix destination file existence check on overwrite
Undo rmdir with mkdir
Fix merging directories on delete then paste

Used to just move directory.
Make moving files from trash safer
Merge branch 'fix-merging-on-delete-paste'

Fix merging directories on delete then paste.