add spotify follow
fix conflicts