I do not think this simplification works. A lot of the conflict is about systematic attempts at expansion of Israel itself - that is what settlements are and always were. Removal and mistreatment of original population went hand in hand with that.
Formerly: South Lebanon, the entire Sinai peninsula.
New and improved: Mt. Hermon, UN buffer zone in the Eastern Golan Heights.