jquery validation work again
merge