modify form validation
merge