Fixed Google hosted jQuery.
Fixed merge conflict