"diabéisso"
"qqer coisa"
" error   "Merge branch 'master' into branch2

Conflicts:
	testegit
"quero o merge"