TestBにコミット！！
Merge remote-tracking branch 'remotes/origin/TestB'

Conflicts:
	sample.txt