A One-Country / Two-State Solution to the Israeli-Palestinian Conflict