adding content
fixed db.js merge conflict