Fixed redirect
Pre-merge index.html redirect fix
final redirect fix