Loop theme music
Fix merge conflict