lots of FE updates
play-tracker progress
conflict in playlist#show resolved