stuff
resolved conflict in index.js