modified index.js
fixed conflict