update the validation form
resolve conlict