Resolve index.html conflict