conflict解消
Merge branch 'master' of github.com:natsumisaito/dotfiles