modify js
merge