added play next song
fixed merge issues