Uncommon Unity: Resolving Conflict