Merging Grunt overhaul