merges the grid to the master branch