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