add comment to .jshintrc
fix conflict