updating db config stuff
merge conflicts