2行目にbbbを追記
Merge branch 'master' of https://github.com/ms2sato/git-test

Conflicts:
	aaa.txt
Merge branch 'master' of https://github.com/ms2sato/git-test

Conflicts:
	aaa.txt