ver3へ修正
Merge branch 'temp1'