added logic for battles to reshuffle attackers in territory after one conflict is resolved