Merge grid branch