block: code merge fix