diffのレイアウトと修正
Merge branch 'development'