index.html conflict FIXED