Two state solution - one state solution. 

Either there is Universal suffrage and - all - people have equal rights or they don't.

If it is a one state solution - then normalise those people as citizens and take responsibility for them - or let them take responsibility for themselves.

There is onus on the weaker party too, but definitely the stronger party has the greater responsibility.