line4を追加
Merge branch 'fish409/develop'

Conflicts:
	test.txt