update jquery
merge