“a conflict that changed American Christianity”