chnages BRANCH3
Merge branch 'BRANCH3' into BRANCH1

Conflicts:
	test.txt