#1372 fix jquery conflict issues