This conflict has been going on for a century and intensified post WW2 and I agree that the UN has been as useless as tits on a bull with respect to engineering a permanent solution.
The current colonisation of the West Bank by Orthodox Jews is totally unacceptable because its seen as a declaration of the State of Israel from River to Sea by stealth.
The obvious answer is the 2 State Solution because both societies are living in the past...the Orthodox Jews by the Bible & the traditional Palestinians by the Koran. For this reason the one state solution with all citizens having equal rights and responsibilities would be very difficult, IMO.
If I were to be a Palestinian I would push for the One Stat Solution knowing fill well that Israel under the influence wouldn't cop that and instead compromise on the 2 State Solution. This IMO would have been a better (peaceful) solution instead of the current martyrdom .
