merge conflict for the index.js