* modify test.js
fix conflicts for test.js
* modify test.js for push to master