use diff3 style for merge conflicts
Merge branch 'master' of github.com:alanctkc/dotfiles