Fix conflicts, add some music files