Resolving rebase merge conflict with Vim/Neovim

TL;DR #

left column is my changes middle is current right is the upstream changes

Use dg2 to apply changes from the left Use dg3 to apply changes from the right