commit to branch2
a
Merge branch 'branch2'

Conflicts:
	hoge.txt