fixes merge conflict on index.html