--no-ffでmasterをマージ
Merge remote-tracking branch 'origin/master' into hito-asa/from2