flipped positions of results and playlist
resolved merge conflicts