change config
merge