added the new js
merge