Title: How to Resolve a Conflict