Cleaned up merge conflict in grid.cc