Jesus, Conflict, and Reconciliation