test2で編集
Merge branch 'test2'

Conflicts:
	test.txt