Add conflict change.
Merge pull request #4 from ogis-yano/rebase-conflict2

Add conflict change.