ver1追加
ver2追加
ver3
Merge branch 'ver3' into ver2

Conflicts:
	text.txt