The sides had been at odds over numerous issues and have agreed to keep working on the remaining open questions they face.