Claude Code mod

conflict-helper

Detects merge-conflict markers and walks you through resolving each one.

3 starsPane & dashboard mods Plugin marketplaceValidates on Claude Code 2.1.316 Source

Install

Inside Claude Code

/plugin marketplace add Plagemes/claude-mods
/plugin install conflict-helper@claude-mods

Mods install like plugins. Run /reload-plugins or start a new session to load it.

What it can access

Reach: L2Writes or runs: runs processes, drives Claude, reads files, reads mod state, draws, other: $.mods.hello, other: $.mods.mode, other: $.mods.notify, other: $.mods.publish, other: $.mods.registerTab
Sees: Bash calls, /"^(?:Edit|Write|MultiEdit|NotebookEdit)$"/ calls
Draws in: Pane
Hooks: session.startcommand.runtool.callprompt.composeui.render

From a static scan of the mod's code by awesome-claude-code-mods. It shows what the code asks for, not a security review.

How Claude Code mods work

A mod is a plugin with a JavaScript or TypeScript module that runs inside Claude Code (version 2.1.287 or later). It can draw panes beside the transcript, a band above the prompt, buttons and toasts, restyle the spinner and tool rows, and watch or rewrite tool calls and prompts.
It installs like any plugin: add its marketplace with /plugin marketplace add owner/repo, then /plugin install name@marketplace.
Check what a mod can reach before installing: it runs with your permissions. Reach goes from drawing only, to reading files, to writing files or running processes, to the network. Run claude plugin validate on a clone to list its hooks and calls without running it.
Turn one off from the Installed tab in /plugin, or start Claude Code with --safe-mode to skip every customization for a session.

Claude Code docs

Details

Repository: Plagemes/claude-mods
Folder: mods/conflict-helper
Marketplace: claude-mods
Author: Plagemes
Type: Pane & dashboard mods
Website: plagemes.github.io/claude-mods/#conflict-helper
License: MIT
Last updated: 15 October 2026
Listed in: awesome-claude-code-mods

FAQ

What is conflict-helper?

Detects merge-conflict markers and walks you through resolving each one. It is a mod for Claude Code, from Plagemes/claude-mods on GitHub.

What can the conflict-helper mod access?

Its widest reach is "writes or runs" (runs processes, drives Claude, reads files, reads mod state, draws, other: $.mods.hello, other: $.mods.mode, other: $.mods.notify, other: $.mods.publish, other: $.mods.registerTab). It sees Bash calls, /"^(?:Edit|Write|MultiEdit|NotebookEdit)$"/ calls. It draws in Pane. Like any mod, it runs with your permissions.