Cleaned up conflicts in model_grid.rst