Which of the following organizations waged guerrilla warfare against Israel
throughout the 1980s but in the 1990s made efforts to negotiate peace?