review / settings
fix conflict