Restructure: Fix merge conflicts in index.html.