fixing longstanding conflicts in index.html