Conky colours
Spelling in vim
Merge conflict resolved in vimrc