Fixing merging of configuration.