chanceOfDefusingOutsideOfBattle
resolved conflict