jshint
merge