git-pull-request-conflict

pnpm dlx shadcn@latest add https://opensourceicon.com/r/tabler/git-pull-request-conflict.json

<svg xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path d="M16 18a2 2 0 1 0 4 0a2 2 0 0 0-4 0"/><path d="M11 6h5a2 2 0 0 1 2 2v8M4 18a2 2 0 1 0 4 0a2 2 0 0 0-4 0m2-7v5M4 4l4 4m0-4L4 8"/></g></svg>