Fix merged-cell borders