Conflict avoidance is not the way of Jesus. In his ministry, Jesus often put himself in the midst of conflict for the purpose of proclaiming the way of God. We saw the same thing in the early church, when Paul and Peter disagreed on the expansiveness of God's love. Sometimes conflict is the most faithful step for Christ's disciples.
