update js
merge