How to Resolve Conflict