# git-merge-conflict

The [git-merge-conflict](https://lucide.dev/icons/git-merge-conflict) icon is drawn by the [Lucide](https://lucide.dev) contributors and published under the [ISC license](https://lucide.dev/license). `@sdxc/icons` renders it as `GitMergeConflictIcon`, from Lucide 1.61.0. If Lucide serves your app, [sponsor it](https://lucide.dev/sponsor).

Tags: code, version control, commits, diff, error, conflict.

## By component

```tsx
import { GitMergeConflictIcon } from "@sdxc/icons";

<GitMergeConflictIcon aria-hidden="true" />
```

## By name

```tsx
import { Icon } from "@sdxc/icons";

<Icon name="git-merge-conflict" aria-hidden="true" />
```

## SVG

```html
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-git-merge-conflict" aria-hidden="true">
	<path d="M12 6h4a2 2 0 0 1 2 2v7" />
	<path d="M6 12v9" />
	<path d="m8.5 3.5-5 5" />
	<path d="m8.5 8.5-5-5" />
	<circle cx="18" cy="18" r="3" />
</svg>
```