test1
test2
hoge
test3
conflict
hoge2
hoge test2
rm
rm
rm
test1
merged
first commit
hoge
hogehoge
fugafuga
second
Revert "second"

This reverts commit 6edce295c63cb072efe1cecd2477c2379fde03d2.
test

This reverts commit b6dcd26ca8c175f5f90cdf2a989b0651d7482816.

test2
test