Bugfix: Merging folders

Merging folders as option to handle name conflicts has been fixed.

https://github.com/owncloud/web/issues/9461
https://github.com/owncloud/web/pull/9477
