fixing vimrc merge