Cosme .zshrc
Change conflictstyle
Cosme .vimrc