modify settings
fix settings
fix conflict