consolidate the config