general
Resolution of a conflict, usually through a compromise between opposing claims, sometimes facilitated through the efforts of an intermediary such as an arbiter.
