bug fix?
Syntax errorの解消
Merge branch 'temp1'