size 1.0
size 1.1

Conflicts:
	index.html