Getting it into your agent
One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.
npx skills add nguyenthanhtat/screen1-claude --skill conflictsgit clone --depth 1 https://github.com/nguyenthanhtat/screen1-claudeWrote this? Show the measurements
A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.
[](https://agentmods.dev/skills/nguyenthanhtat/screen1-claude/conflicts)<a href="https://agentmods.dev/skills/nguyenthanhtat/screen1-claude/conflicts"><img src="https://agentmods.dev/badge/skills/nguyenthanhtat/screen1-claude/conflicts/github.svg" alt="Measured on agentmods" height="20"></a>Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.
<a href="https://agentmods.dev/skills/nguyenthanhtat/screen1-claude/conflicts"><img src="https://agentmods.dev/badge/skills/nguyenthanhtat/screen1-claude/conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>What it costs to keep this loaded
Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.
| Model | Per session | Once invoked |
|---|---|---|
| Fable 5.1 | $0.00000 | $0.04487 |
| Opus 5 | $0.00000 | $0.02243 |
| Sonnet 5 | $0.00000 | $0.00897 |
| Haiku 4.5 | $0.00000 | $0.00449 |
Grade A, and why
conflicts scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 9d ago.
A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.
Nothing flagged
None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.
How it starts
The opening of the file, as written. The whole thing — 858 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Git Conflicts
Parent Skill: /git
Path: /git/conflicts
Purpose
Master conflict resolution for merge and rebase operations, understand conflict markers, use resolution strategies, and prevent conflicts through best practices.
When to Use
Trigger automatically when:
- User mentions: conflict, merge conflict, rebase conflict, <<<<<<, resolve, merge failed
- After merge/rebase shows conflicts
- CONFLICT message appears
- Files show conflict markers
- Stuck in merge/rebase state
Chat commands:
/git/conflicts help me resolve this merge conflict
/git/conflicts what do the conflict markers mean
/git/conflicts use theirs for all conflicts
/git/conflicts abort this merge
/git/conflicts prevent conflicts in the future
Requirements
Verification
# Check if in conflict state
git status
# See conflicted files
git diff --name-only --diff-filter=U
# See conflict markers
git diff --check
Critical Rules
Conflict Workflow
Attempt merge/rebase → Conflict! → Resolve → Stage → Complete
States:
1. Normal work
2. Conflict detected
3. Manually resolve (edit files)
4. Stage resolved files (git add)
5. Continue or commit
Patterns
Pattern 1: Understand Conflict Markers
Problem: Decipher what conflict markers mean
# File with conflict looks like:
<<<<<<< HEAD (Current Change)
const API_URL = "https://api.prod.com";
=======
const API_URL = "https://api.staging.com";
>>>>>>> feature-branch (Incoming Change)
What this file has done since we first saw it
Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.
- 9d ago First seen · 858 lines · 0 tokens per session scan A 05c2592e1eff
conflicts is a skill published in the GitHub repository nguyenthanhtat/screen1-claude (2 stars, last pushed 3mo ago), licensed MIT. It costs nothing until one of its globs matches a file; then it loads 4,487 tokens. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.
Other skills, from other repositories
prowler-commit
Creates professional git commits following conventional-commits format. Trigger: When creating commits, after completing code changes, when user asks to commit.
gh-auth-isolation
Safely manage multiple GitHub identities (EMU + personal) in agent workflows.
comet-github
A routing guide for Comet-related GitHub work. It directs requests about pull requests, issues, CI failures, ideas, and fixes to the appropriate review or implementation process.
github-skill
Work with GitHub via the gh CLI — clone repositories, create/list/merge pull requests, create/list issues, and run any other gh command (API calls, workflow runs, releases, repo administration). List operations return parsed JSON.
re0-merge
Review and land an external contribution the way this suite does: gate it against the thesis, land it with the author's credit intact, complete a new skill rather than merging it raw, then approve, credit, and explain before closing. Use when reviewing a pull request, as any collaborator or maintainer, not only the…
nvca-chart-release
Release NVCA Operator chart changes from the native monorepo source to the vendored Helm chart. Use when updating the vendored NVCA Operator chart, changing NVCA image refs, publishing helm-nvca-operator, or validating the chart against a self-managed control plane.