conflict this!
Merge branch 'master' of https://github.com/jagob/dotfiles
mergetool diff3