Oi mesmo
Adicionando o Hi.txt
Merge branch 'origin/master-3'

Conflicts:
	Oie.txt