started from validation
fix merge conflict