Getting it into your agent
It runs from inside its repository, so the clone comes first — what it calls does not travel with the file alone.
git clone --depth 1 https://github.com/wan-huiyan/agent-traffic-controlnpx agentmods add skills/wan-huiyan/agent-traffic-control/merge-conflict-generated-filesWrote 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/wan-huiyan/agent-traffic-control/merge-conflict-generated-files)<a href="https://agentmods.dev/skills/wan-huiyan/agent-traffic-control/merge-conflict-generated-files"><img src="https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/merge-conflict-generated-files/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/wan-huiyan/agent-traffic-control/merge-conflict-generated-files"><img src="https://agentmods.dev/badge/skills/wan-huiyan/agent-traffic-control/merge-conflict-generated-files.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.00036 | $0.03138 |
| Opus 5 | $0.00018 | $0.01569 |
| Sonnet 5 | $0.00007 | $0.00628 |
| Haiku 4.5 | $0.00004 | $0.00314 |
Grade A, and why
merge-conflict-generated-files 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 11d 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 — 269 lines — stays where its author put it; the contents beside it link to each section on GitHub.
Merge Conflict in Generated Output Files
Problem
A project generates output files (HTML, JSON, CSS, TypeScript declarations, OpenAPI specs, etc.) from a source-of-truth input. Both branches modified the source AND committed fresh generated outputs. The merge/rebase now shows conflicts in the generated files — but hand- merging them is both futile (the generator will overwrite them) and error-prone (computed totals, sorted indexes, and aggregated summaries can't be correctly resolved by text diffing).
The key mistake to avoid: treating generated file conflicts as real conflicts requiring line-by-line resolution. They're not — they're a side effect of forgetting that the files are derived.
Context / Trigger Conditions
Apply this skill when ALL of these hold:
- Multiple files are in the conflict set, but most of them look like generated output (HTML tables, JSON indexes, minified CSS, declaration files, changelogs built from commits).
- You can identify a single source generator that produces them — a build command, a Python
script,
make docs,npm run build,openapi-generator, etc. git diff --name-only origin/main...HEADshows the same generator SOURCE (not output) was also modified on your branch, meaning both sides touched the source AND re-ran the generator.- Hand-merging the outputs would produce semantically wrong results (e.g., duplicate tracker entries, stale totals, mismatched sort order, broken JSON).
If only condition 4 holds — the conflicting thing is one derived NUMBER inside a file a human wrote (a stated test count, a coverage percentage, a totals row) — conditions 1–3 all fail: the conflicting file is hand-authored rather than generated output; nobody generates it; and there is no generator source for either side to have modified. The reasoning still holds and the remedy is different, because there is no generator to re-run. Skip to Variant — the derived thing is a VALUE inside a hand-authored file, below.
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.
- 11d ago First seen · 269 lines · 36 tokens per session scan A 021011fdb347
merge-conflict-generated-files is a skill published in the GitHub repository wan-huiyan/agent-traffic-control (3 stars, last pushed 6d ago), licensed MIT. It adds 36 tokens to every session and 3,138 once invoked, about $0.0002 per session on Opus 5. 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
cloudflare-workers-ci-cd
Complete CI/CD guide for Cloudflare Workers using GitHub Actions and GitLab CI. Use for automated testing, deployment pipelines, preview environments, secrets management, or encountering deployment failures, workflow errors, environment configuration issues.
claude-code-bash-patterns
Claude Code Bash tool patterns with hooks, automation, git workflows. Use for PreToolUse hooks, command chaining, CLI orchestration, custom commands, or encountering bash permissions, command failures, security guards, hook configurations.
bump-sdk-version
Bump the FutureSearch SDK version across all files. Use when releasing a new SDK version, updating version numbers, or the user says bump version, release, version bump.
pr-check
PR review compliance: fetch review comments from an open PR, categorize as resolved/unresolved/dismissed, critically evaluate fixable items, implement approved fixes, and reply inline. Pass --unattended to halt on human-judgment items (emitted as Pending-Human) instead of prompting via AskUserQuestion.
babysit
PR babysitter: monitors CI status, auto-rebases when behind, auto-fixes CI where possible, delegates review comment handling to dlc:pr-check, and re-requests review after fixes. Designed for /loop usage with Remote Control.
git-ops
Git hygiene: clean up merged branches, prune stale remotes, and verify repository state.