Update DB settings
Solve Merge Problem