gruntfile merge errors fix