rm kernel.vimrc and merge the changes from master