返事。
Merge branch 'hotfix/hmori'

Conflicts:
	root/stady.txt