Merge changes in CouchManager and configs.