fix js
fix conflict