Deleted grid
Fixed merge