commit branch1
commit branch2
branch1
main
Merge branch 'branch1'

Conflicts:
	src/git_sample/test.java