changed db config file back to default values for merge