Update db.js
Resolved merge conflict in db.js