jshint
merge
jshint
jshint