fix conflict of reacent  mearge
fixed the bug of error of empty submited change_note or add_note form while validating