complete spotify lab
fixed merge issues