4TH Commit
testBranch 2回めのコミット
Merge branch 'testbranch'

Conflicts:
	note.txt