Settling and Resolving Conflict