Fixes db config load
Merge database.js conflict