fixed jQuery conflict