The term 'two-state solution', often seen in news coverage of West Asia, refers to a proposed resolution of which one of the following conflicts?