changes in index.js.
merge conflict resolved