Last-minute crisis in talks with Hamas has been resolved