How do we resolve conflict?