Update config
Merge