Update config file
Merge with new client