fix conflict
Merge pull request #2 from koudaiii/new_branch_name

fix conflict