added minified js
merge