fixed merge conflict marker in jshintrc