block: row: fix merge