difftool - kaleidoscope
colorscheme Monokai
Merge remote-tracking branch 'origin/master'