jquery conflict solvd