index,js conflict resolved