Revert "mergeした"

This reverts commit 7b82727df1cc5febac9e665357c5b3a44eea40d1.
修正　
Merge remote-tracking branch 'origin'