https://github.com/akinsho/git-conflict.nvim if you're into neovim