Fix config merging.