Update merged files
Merge pull request #426 from shinagaki/fix_merged

Update merged files