push conflito 2 - teste
resolved

Conflicts:
	teste.txt