vimrc merge
tmux -2
fix vimrc