/

Use in your agent

Stroke1.25 px

Corner radius2.00

Preview size24 px

Colour

Merge conflict icon

Development · Git & version control

git-merge-conflict

conflict · clash · failed merge · resolve

UIUXIcon · 6,863 icons · MIT licence · MCP server · llms.txt

Icon artwork © 2026 UI8, from the IconMCP library, MIT. A few hand icons follow shapes from Phosphor, Tabler (MIT) and Lucide (ISC).