conflict resolved: index.html