fix where playlist_panel renders
merge conflict