rename xblocks.utils.merge -> xblocks.utils.extend