test c
branch1
Merge branch 'branch1' into branch2

Conflicts:
	src/TestB.java