fix spotify linking bs
fix merge