change js
merge