Fix vimrc merge