branch2 first commit
Merge branch 'master' into branch2
commit
conflict fixed
test
Merge branch 'branch3'

Conflicts:
	file2.txt