Fix validation
Fix config merge