Test commit2
TestCommit3
Merge branch 'test_branch'

Conflicts:
	testFile.java