atl rovo dev not in preferred list until fully tested

src/modules/bmm/docs/brownfield-guide.md

@@ -725,13 +725,7 @@ flowchart TD
 - **[Quick Start Guide](./quick-start.md)** - Getting started with BMM
 - **[Glossary](./glossary.md)** - Key terminology
 - **[FAQ](./faq.md)** - Common questions
-  <<<<<<< Updated upstream
-  =======
 - **[Troubleshooting](./troubleshooting.md)** - Problem resolution
-  <<<<<<< Updated upstream
-  > > > > > > > # Stashed changes
-  > > > > > > >
-  > > > > > > > Stashed changes
 - **[Workflow Documentation](./README.md#-workflow-guides)** - Complete workflow reference
 
 ---
@@ -746,13 +740,7 @@ flowchart TD
 
 **Documentation:**
 
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-
-- # [Test Architect Guide](./test-architecture.md) - Comprehensive testing strategy
-  > > > > > > > # Stashed changes
-  > > > > > > >
-  > > > > > > > Stashed changes
+- **[Test Architect Guide](./test-architecture.md)** - Comprehensive testing strategy
 - [BMM Module README](../README.md) - Complete module and workflow reference
 
 ---

src/modules/bmm/docs/glossary.md

@@ -95,20 +95,10 @@ Game development equivalent of PRD, created by Game Designer agent for game proj
 
 ## Workflow and Phases
 
-<<<<<<< Updated upstream
-
-# <<<<<<< Updated upstream
-
-=======
-
-> > > > > > > Stashed changes
-
 ### Phase 0: Documentation (Prerequisite)
 
 **Conditional phase for brownfield projects.** Creates comprehensive codebase documentation before planning. Only required if existing documentation is insufficient for AI agents.
 
-> > > > > > > Stashed changes
-
 ### Phase 1: Analysis (Optional)
 
 Discovery and research phase including brainstorming, research workflows, and product brief creation. Optional for Quick Flow, recommended for BMad Method, required for Enterprise Method.

src/modules/bmm/docs/quick-spec-flow.md

@@ -645,7 +645,7 @@ Quick Spec Flow is your **fast path from idea to implementation** for:
 - **Try it now:** Load PM agent and describe a small change
 - **Learn more:** See the [BMM Workflow Guides](./README.md#-workflow-guides) for comprehensive workflow documentation
 - **Need help deciding?** Run `workflow-init` to get a recommendation
-- **Have questions?** Join us on Discord: https://discord.gg/gk8jAdXWmj
+- **Have questions?** Join us on Discord: <https://discord.gg/gk8jAdXWmj>
 
 ---
 

src/modules/bmm/docs/troubleshooting.md

@@ -192,7 +192,7 @@ workflow-init asks: "Is this work in progress or previous effort?"
 
 **Solution:**
 
-1. Check spelling/format - Use exact workflow name or menu shortcut (*prd not *PRD)
+1. Check spelling/format - Use exact workflow name or menu shortcut (`*prd` not `*PRD`)
 2. Verify agent has workflow:
    - PM agent: prd, tech-spec
    - Architect agent: create-architecture, validate-architecture