updating settings
merge!