A pro-Palestine vigil and a protest planned for Sydney this weekend will both go ahead after organisers reached an 11th-hour compromise with police and amended their plans.