Use fancier words to make the point more clearly
Merge remote-tracking branch 'origin/edit-2'

Conflicts:
	index.html