Ediff - show conflicted changes
Merge branch 'master' of github.com:bratarmin/.emacs.d