brancheando em DEV
xxxxxxxxxxxxxxxxxxxx
sssssssssssssss
Merge branch 'dev'

Conflicts:
	file.txt