Fix merges of cells with background