Merge pull request #1 from kouta3324/test

Test
Update test02
m
fix conflict