Config database
Resolve Conflicts