Optimize code of validation data
fix conflict