updating js
merging