added first part of typo
fixed conflict in index.html