BattleManager update
manual merge