update settings
fix conflict in settings and merge
update settings
update settings
added default MODE in settings, removed BASE in settings