Fixed merge.py for new iterator interface.