modify confrict file inagawa
Merge pull request #2 from s-inagawa/hoge

initial commit