refactor gruntfile
fixed merge conflicts