fix settings page bug
fixed merge
fix merge
merge conflicts