Gaza conflict resolution plan