Loading the registry…
Carefully resolve git merge, rebase, or cherry-pick conflicts. Tiers the merge by scope, clusters related conflicts, then uses paired defender subagents per cluster to evaluate both sides without bias toward "ours." Frontend conflicts always receive extra care including mandatory visual verification. Triggers when git reports CONFLICT, when you land in a halted merge/rebase/cherry-pick state, or when the user asks to "fix conflicts" / "resolve merge conflicts" / "finish this merge".
Claude Skills are markdown + scripts loaded into Claude Code; scanned with the same pipeline.
We found this by crawling public sources and nobody has attested to it. That is how most of the registry gets here, and it is not a mark against the artifact — it only means no authenticated act of publication is on record. An artifact can be the vendor's own and still appear here.
Claude Skills install to a single target, no runtime picker.
nerlo install -- dawsonl1/merge-conflict-tool
Manual alternative: copy the skill folder into ~/.claude/skills/ so Claude Code loads it on next launch.
cp -r -- dawsonl1/merge-conflict-tool ~/.claude/skills/
Install respects the composite badge: Clean proceeds, Caution prompts for confirmation, and Flagged is refused. Write operations require an API token.
3 of 11 scanners examined this package. The rest do not apply to it — language, ecosystem and packaging decide which analyzers can say anything, and a scanner that cannot examine an artifact reports nothing rather than passing it.
v2.0.11
5 findings · 5.7s
v0.3.74
1 finding · 0.6s
v0.1.0
0 findings · 2.4s
v1.4.0
None of the entry points this scanner reads were found in this artifact. What each scanner covers
0 findings · 0.1s
v0.1.0
No source files this scanner can analyze were found in this artifact. What each scanner covers
0 findings · 2.4s
vv0.3.2
No Go packages were found in this artifact. What each scanner covers
0 findings · 0.1s
v0.1.0
This scanner found nothing in this artifact that it assesses. What each scanner covers
0 findings · 0.9s
v0.71.0
No dependency manifest or lockfile was found in this artifact. What each scanner covers
0 findings · 0.2s
v2.3.8
No dependency manifest or lockfile was found in this artifact. What each scanner covers
0 findings · 0.1s
v0.71.0
No container image was published for this artifact. What each scanner covers
0 findings · 0.0s
vv1.6.0
No Go modules were found in this artifact. What each scanner covers
0 findings · 0.1s
1 scan on record. Every scan's full results are retained immutably for 24 months.
| Completed | Composite | Change | Scanners | Status |
|---|---|---|---|---|
| Aug 21, 2026 | Caution93 | — | agentshield ·n/a: not applicablecisco-skill-scanner: completeagent-audit-kit: completenerlo-behavioral ·n/a: not applicablenerlo-install-instruction: completecapslock ·n/a: not applicablenerlo-multi-source ·n/a: not applicabletrivy ·n/a: not applicableosv-scanner ·n/a: not applicabletrivy_image ·n/a: not applicablegovulncheck ·n/a: not applicable | completed |
Findings in files this artifact installs stand as reported; a model re-read the rest and said which ones it believes are false positives. This is a second opinion published beside the evidence, not a correction to it: the per-scanner reports above are unchanged, every dismissed finding is still listed there at its original severity, and the score and the Caution badge are computed from those raw severities alone. Nothing below moved them.
Out of 6 findings across every scanner that examined this package.
These findings are in files this artifact installs and are not placeholder values. No false-positive basis can be corroborated for such a finding, so this review never dismisses one; they were not sent to the model and stand at their scanner's severity.
3 MANIFEST_MISSING_LICENSE
Files: /repo/plugins/merge-conflict-tool/skills/merge-conflict-tool/SKILL.md, /repo/SKILL.md, /repo/plugins/merge-conflict-tool/SKILL.md · reported by cisco-skill-scanner
2 SOCIAL_ENG_VAGUE_DESCRIPTION
Files: /repo/SKILL.md, /repo/plugins/merge-conflict-tool/SKILL.md · reported by cisco-skill-scanner
1 AAK-MARKETPLACE-001
Files: .claude-plugin/marketplace.json · reported by agent-audit-kit
High severity finding in marketplace configuration.
The artifact contains a high severity finding related to its marketplace configuration. This finding, identified as AAK-MARKETPLACE-001, is located in the `.claude-plugin/marketplace.json` file. This configuration may permit broad external interaction or data exposure, warranting careful review before installation.
Concern level assessed by the review: High. This is the review's scale, not the registry badge.
Reviewed by gemini-2.5-flash. The model sees the findings, not your code, and cannot change a score.