What was the process by which the terms of the peace agreement were reached at the Geneva convention?