confilict
Merge pull request #6 from NoguHiro/conflict_nogu

confilict