Conflict and Christianity: Jesus: From Righteousness to Religion