updated conflict test

reduced speed impact on conflict resolution

added "balanced" tests, which are testing conflict
resolution for the same two units