GitMergeConflict, the duotone drawing of git-merge-conflict on a 24×24 grid, with rounded corners. Available in stroke, two-tone, duotone, fill.
pnpm dlx shadcn@latest add "https://keylineicons.com/r/duotone/git-merge-conflict.json"