Fixed merge conflict in index.html
Fixed merge conflict in index.html

Universav/UniversavPoke,Universav/UniversavPoke,Universav/UniversavPoke,Universav/UniversavPoke,Universav/UniversavPoke,Universav/UniversavPoke