add js
merge