- new merge
- removed a confirm:onCancel: because it was causing problems with non-iterative mode.