* modify test.js
* modify test.js ~ xyt
fix conflicts for test.js