jquery conflict error solved