Fixed a messed up merge in gridlayout.py