Fix PR3138: if we merge the entry block into another block, make sure to