Add merge folder and skip/resume on same file

[davotoula]

A common issue when transferring large amount of files to my android devices is interruption.

This can be due to overheating, faulty cable or MTP just giving up.

A merge folder and skip/replace files would greatly help when resuming the transfer