merge vimrc from master
remove merge markers