grunt file changes
conflict error removed'
merging conflicts removed
extra ] bracket removed
nothing just comments in gruntfile.js
Merge branch 'NewBranch'
grunt file changes