js conflict solved