add the setting
merge