diftoggle in vimrc
fix screenshot script; add git merge options