update settings
merge fix