gでもgitの補間を有効に
Merge branch 'master' into offair