block:fix merge from recent update for block