modified jquery conflict