test for example
modify: base.js
add some js file
conflicts fixed