* refactoring: db config moved to separate file
* resolved conflict