merging validations
fix merge conflicts