updates for new probability forecasts
conflict resolution