after conflict in test.js