wndows chag
resolved conflict in index.html