2
Merge branch 'branch2' into branch3

Conflicts:
	documento_1.txt