gerando conflito branch conflito
gerando conflito master
Merge branch 'conflito'

Conflicts:
	historia.html