update formValidator
merge