gruntfile.js configration changed
conflicts resolved