Bugfix: Keep both folders conflict in same-named folders

Parsing has been adjusted to account for edge case of multiple folders and sub-folders with the same name

https://github.com/owncloud/web/pull/9915
https://github.com/owncloud/web/issues/9158
