db config
merge conflict fixed
database config file amended