First pages commit
conflicts removed in index.html