Conflict and the Gospel