CURRENT playlist tab
merge conflicts resolve and CURRENT tab