Conflict Resolution: How to Resolve a Conflict Elegantly