testando conflito
testando conflito v2
testando conlito - develop
Merge branch 'develop'

Conflicts:
	teste.txt