post-mergeの適用方法の加筆
Merge branch 'lassi'