.gitignore追加
merged