Learning to resolve conflict