small change
All conflicts solved:

Conflicts:
	index.html