resolve the conflict in index.html
resolve the conflict in index.html

Johnetordoff/osf-style,haoyuchen1992/osf-style,CenterForOpenScience/osf-style,haoyuchen1992/osf-style,CenterForOpenScience/osf-style,Johnetordoff/osf-style