Added the ability to merge duplicate folders when using virtual folders.