Some commit
Other commit

Conflicts:
	index.html