How did the Israeli Palestinian conflict evolve?