fix jquery conflict resolution