new vim molokai colorscheme
merge conflict