fix local vimrc timing
fix merge