New message in Console
gerando conflito
Merge branch 'teste'

Conflicts:
	teste.cs
stashed changes