settings page and ...
merge conflict