myBranch編集コミット
Merge remote-tracking branch 'origin/myBranch'

Conflicts:
	README.md
Merge branch 'master' into myBranch3_1_1

Conflicts:
	README.md