jquery added
merge conflict fix