Conflict Resolution You Can Rely On