Update .gitconfig

$ git config branch.master.remote origin
$ git config branch.master.merge refs/heads/master