trying to resolve conflict for index.html for the 3rd time