fix merge conflicts
Configuration validation support