commit conflict test
add file
Merge pull request #1 from hachi-eiji/branch2

ok !