use -X theirs when cherry-picking
Merge branch 'master' of github.com:thurn/dotfiles