fixed conflict, udpadted jshint