resolve merge conflict after cherry-picking master index.html change