fixed jquery conflicts