BRANCH 1 change
Merge remote-tracking branch 'origin/BRANCH1' into BRANCH1

Conflicts:
	test.txt