worked on playlist and deleted dies
fixed merge