A Faith that Works through Conflict