Fixing jquery conflicts