implemented wait for 20 secs before considering changing song
fixed merge conflicts
done