I show off emacs's `smerge-mode`, which makes dealing with git-based merge conflicts delightfully boring. Find me at https://richarde.dev/ or on Twitter at @RaeHaskell. Video index at https://richarde.dev/videos.html