fix conflict
Merge branch 'master' of https://github.com/hroussez/vimrc
remove backup files