拡張子変更
Merge remote-tracking branch 'origin/master'