I have been reading questions about the lamed-vav, the 36 righteous people who exist in each generation.
But Rashi, in Zecharia 11:12 cites the gemara in Chullin 92a which has an opinion that there are 45 righteous Jews in the world.
The gemara there also has an opinion that there are 30 righteous non-Jews.
Then Rashi in Zecharia references the idea that
the Midrash Aggadah (Cf. Gen. Rabbah 49:3, Pesikta d’Rav Kahana 88a), that our father Abraham was promised that no generation would have fewer than thirty righteous in men, the number of (Gen. 15:8): “So shall your seed be.” The word יִהְיֶה has the numerical value of thirty.
Is there are text which reconciles these different versions of the number of righteous (men? Jews?) in the world at any time?