rm merge conflict artifacts
fix defaults for jshint 2.x