git-powerline,airlineの古い設定を削除
Merge remote-tracking branch 'origin/master'