resolve js conflict