I think this might work better
Merge branch 'master' of github.com:yramagicman/dotfiles

* 'master' of github.com:yramagicman/dotfiles:
  testing things

Conflicts:
    bin/gup