A religious conflict tamed