Fixing Grunt File As there were merge conficts