Fixed merge conflicts in Grid class