Resolve index.html conflict and normalize line endings 74f5e26 verified User01110 commited on about 12 hours ago