fix js conflict