Allow a block for merge and update

Fixes #51