git変更のテストだ
Merge branch 'branch-3'

Conflicts:
	CMXGitTest/src/testpakcage/test.java