added .html to index
added errors in index
solved conflicts