merge conflict
settings update