Fixed gruntfile conflicts