ok, maybe this will help
Merge branch 'master' of github.com:trommel/dotfiles
I don't know