Resolved index.html conflicts