merge settings
Merge branch 'playlist'