What is the best way to resolve conflict?