A one-country / two-state solution to the Israeli-Palestinian conflict