public playlists view is made
Merge conflict is resolved