branch2
conflict
Merge branch 'branch2'

Conflicts:
	src/test.java