Fixed another merge conflict

-In blockgrid.py