fix radio player
merge conflicts