fix issue with defaults and config not merging