diff --git a/agents/requirements-analyst.md b/agents/requirements-analyst.md
index 3df2262..c2aab6a 100644
--- a/agents/requirements-analyst.md
+++ b/agents/requirements-analyst.md
@@ -53,6 +53,9 @@ You MUST NOT:
 
 <<<<<<< HEAD
 =======
+<<<<<<< HEAD
+=======
+>>>>>>> 849ad8e53279082e5d59e7e68f30f236f49900c1
 When the project description is incomplete:
 
 Conduct a single bounded round before writing `pipeline/01-srs/srs.md`.
diff --git a/skills/forge-srs/SKILL.md b/skills/forge-srs/SKILL.md
index 1488184..d88db0d 100644
--- a/skills/forge-srs/SKILL.md
+++ b/skills/forge-srs/SKILL.md
@@ -25,14 +25,9 @@ allowed-tools: [Read, Write, WebSearch, WebFetch, Grep]
 2. Adopt that persona completely — you are now the Requirements Analyst.
 3. Ask the user to describe their project if they haven't already. Gather: what the system does, who uses it, key constraints (technology, timeline, compliance).
 4. Follow the Requirements Analyst workflow: clarify, categorize, assign REQ-IDs, write acceptance criteria.
-<<<<<<< HEAD
-5. Write `pipeline/01-srs/srs.md` per the Output Contract in the persona file.
-6. Run `python3 ${CLAUDE_PLUGIN_DIR}/scripts/state-manager.py advance --to 1` to mark Stage 1 active.
-=======
 5. Conduct a single bounded round of clarification questions (REQ-INTERACTIVE-CLARIFY-001) before writing `pipeline/01-srs/srs.md` — one batch, not a drip. Unanswered questions become documented assumptions in the SRS.
 6. Write `pipeline/01-srs/srs.md` per the Output Contract in the persona file.
 7. Run `python3 ${CLAUDE_PLUGIN_DIR}/scripts/state-manager.py advance --to 1` to mark Stage 1 active.
->>>>>>> 5a2d054873ab85c3b8590120b883ff3fcfc97f3a
 
 ## Verification