jquery conflict resolved