changed the play behavior to look for the name in spotify and local playlists and add both if there are
Merge remote-tracking branch 'origin/master'