Fix extend in grid helpers
Corrected merge in grunt config