update config
merge