fixed jquery conflict