# Resolve Conflict

> Resolve disagreements between security and architecture reviews conservatively.

- Skill: `majiayu000/resolve-conflict-3` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add majiayu000/resolve-conflict-3`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/resolve-conflict-3/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Security
- Author: majiayu000 (https://skillmd.com/u/majiayu000)
- Updated: 2026-09-22
- Page: https://skillmd.com/skills/majiayu000/resolve-conflict-3

---


# Resolve Conflict

## When to use

- Security vs architecture reviewers disagree.

## Instructions

1. If security blocks (high/critical): treat as blocked until fixed.
2. If architecture blocks: fix if major; otherwise document explicitly before proceeding.
3. Produce a decision + fix plan.