Final fix for merging configuration.