removed merge conflict from gruntfile