Coming to Peace: Resolving Conflict Within Ourselves and With Others