database settings
fix conflict
fix conflict