Redeeming Conflict