fix grids
merging