Fix js conflict