Adding in a new playlists, moving staff picks to cache and adding file to update cache
resolving conflicts