index.html conflict resolved