update for grunt merge task