Fix config merge errors