update config
Merge