add spotify
solve conflicts