The former since that would be the definition of a secular democracy. The same immigration and citizenship laws regardless of religion or ethnicity. There's definitely need of some reparations as well, so I think right of return would play a role in re-establishing the Palestinian population from where they were displaced.