Fixed js conflict