manifest修正
Merge remote-tracking branch 'origin/master'
一旦ｺﾐｯﾄ
競合解消