Fix merge issues on index.html