index.js conflict resolved