modify data validation
merge
merge solve conflict
 add config
solve problems