add ruler to vimrc
add mergetool to gitconfig
fuck