Fixed merge conflict
Grunt updates