Resolving duplicate folders...