m
fix conflict
Merge pull request #2 from kouta3324/test

Test