Added db.js and changed index.js so it will import from db.js
Changed conflicts