* modify test.js
fix conflicts for test.js