resovendo CR001
Merge branch 'branchA'

Conflicts:
	fileA.txt
	fileB.txt