add settings
fix conflict