update to hp and playlists
merge error
merge conflict