linked end rhythm game to dialogue scene
resolving merge conflicts