Fixing conflicts on index.html