ediff highlight all
Merge branch 'master' of github.com:skjaidev/conf-files