リベースのため
for stash
cherrypickの競合を解決
Revert "リベースのため"

This reverts commit e046853400faef193234d0ef5955f4a14c0d6a28.
Merge branch 'topic/lino'

Conflicts:
	file.txt