save settings on change.
resolve merge conflict