Resolving Everyday Conflict