resolve gruntfile merge conflict