Norwegian mediator Erik Solheim said the agreement came during two days of talks in Geneva that ended Thursday .