merge old and new vimrc