fix vimrc auto merge issue