---
title: "Merge conflict animated icon"
description: "Merge conflict animated icon (Developer & version control). The merge conflict is resolved. Light: the blocking slash at the junction retracts, a check draws on in its place, and the junction pops as the check lands, then settles. Strong: the branches and junction first shake against each other (the conflict), then the slash retracts, the check snaps on with a hit and the junction pops bigger and settles in two beats. The check holds until the preview reset."
canonical: https://generativeicons.lottiefiles.com/icons/merge-conflict/
---

# Merge conflict animated icon

The merge conflict is resolved. Light: the blocking slash at the junction retracts, a check draws on in its place, and the junction pops as the check lands, then settles. Strong: the branches and junction first shake against each other (the conflict), then the slash retracts, the check snaps on with a hit and the junction pops bigger and settles in two beats. The check holds until the preview reset.

- Id: `merge-conflict`
- Category: Developer & version control
- Search terms: conflicts, resolve conflicts, fix conflict, merge error, merge failed, collision, clash, incompatible changes, conflict resolved, merge blocked
- Two states: prepared to result, played forward and back
- Styles: outline, solid, duotone; outline weights 1.5, 2, 2.5 (any from 1 to 3); motion light or strong
- File: https://generativeicons.lottiefiles.com/assets/merge-conflict.lottie (dotLottie, 7439 bytes, sha256 1c34efe1757a5367741c3bab05b88739122bce702403db58899d0f76f4d389bb)
- License: MIT

## Install

```sh
npm install @lottiefiles/generative-icons-runtime
npx generative-icons init
npx generative-icons add merge-conflict
```

## React

```tsx
// npm install @lottiefiles/generative-icons-react
'use client';
import { AnimatedIcon } from '@lottiefiles/generative-icons-react';
import icon, { src } from './generative-icons/merge-conflict.mjs';

export function MergeConflictIcon() {
  return <AnimatedIcon icon={icon} src={src} size={32}
    color="#ffffff" variant="outline" weight={2}
    motion="light" theme="dark" />;
}
```

## JavaScript

```js
import { createIcon } from '@lottiefiles/generative-icons-runtime';
import icon, { src } from './generative-icons/merge-conflict.mjs';

const handle = await createIcon(canvas, {
  icon, src,
  color: '#ffffff', style: 'outline', weight: 2,
  motion: 'light', theme: 'dark'
});
button.addEventListener('click', () => handle.play());
// On removal: handle.destroy();
```

More: https://generativeicons.lottiefiles.com/icons/merge-conflict/ · https://generativeicons.lottiefiles.com/api/icons/merge-conflict