fixed index.html conflicts