resolved merge conflict with index.js