js coding style
modify js
resolve conflict