fixed unintended changes

resolved conflict with index.html