resolving jquery conflicts