add js
merge conflict