allow a block for merge and update
Merge pull request #78 from intridea/merge-update-block

Allow a block for merge and update