break index.html again
fixing merge conflict /w index.html