fixed missing call to reset operation in merge command
Merge pull request #409 from volaya/merge_abort

fixed missing call to reset operation in merge command