adjust
add js
conflict