resolving mixup rebase

5 jobs for 1218-smartplaylist_backend in 7 minutes and 26 seconds (queued for 7 seconds)
latest