js conflict fix