I don't think there is a conflict. Each human has a neshama, however, Jews have two neshamot - one that all the goyim have, and an extra one that only Jews have. Additionally, there is a third neshama that only Jews Receive on shabbat.

I don't think there is a conflict. Each human has a neshama, however, Jews have two neshamot - one that all the nations have, and an extra one that only Jews have. Additionally, there is a third neshama that only Jews Receive on shabbat.