ajout vimrc
merge