update min.js
merge