Create Branch1
Add sixth line
Add extra line.
Merge branch 'Branch1'

Conflicts:
	index.html