Fixing errors in merge, and making GameGrid size static