fixing index.js merge problem