diff --git a/bmad-method-6.0.0-alpha.14.tgz b/bmad-method-6.0.0-alpha.14.tgz
deleted file mode 100644
index 9a21d9d3..00000000
Binary files a/bmad-method-6.0.0-alpha.14.tgz and /dev/null differ
diff --git a/src/modules/bmm/docs/README.md b/src/modules/bmm/docs/README.md
index d5608e55..4a9bfa7d 100644
--- a/src/modules/bmm/docs/README.md
+++ b/src/modules/bmm/docs/README.md
@@ -139,9 +139,6 @@ Comprehensive documentation for all BMM workflows organized by phase:
   - Complete story lifecycle
   - One-story-at-a-time discipline
 
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-
 - **[Testing & QA Workflows](./test-architecture.md)** - Comprehensive quality assurance (1,420 lines)
   - Test strategy, automation, quality gates
   - TEA agent and test healing
@@ -149,14 +146,6 @@ Comprehensive documentation for all BMM workflows organized by phase:
 
 **Total: 34 workflows documented across all phases**
 
-=======
-
-> > > > > > > Stashed changes
-
-=======
-
-> > > > > > > Stashed changes
-
 ### Advanced Workflow References
 
 For detailed technical documentation on specific complex workflows:
@@ -181,23 +170,9 @@ Quality assurance guidance:
 
 <!-- Test Architect documentation to be added -->
 
-<<<<<<< Updated upstream
-
-<<<<<<< Updated upstream
-
 - Test design workflows
 - Quality gates
 - Risk assessment
-- # NFR validation
-  =======
-  > > > > > > > Stashed changes
-  - Test design workflows
-  - Quality gates
-  - Risk assessment
-  - NFR validation
-    > > > > > > > Stashed changes
-
----
 
 ## 🏗️ Module Structure
 
diff --git a/src/modules/bmm/docs/workflows-implementation.md b/src/modules/bmm/docs/workflows-implementation.md
index b0cf9bb2..16791617 100644
--- a/src/modules/bmm/docs/workflows-implementation.md
+++ b/src/modules/bmm/docs/workflows-implementation.md
@@ -133,7 +133,6 @@ The `sprint-status.yaml` file is the single source of truth for all implementati
 ### (BMad Method / Enterprise)
 
 ```
-<<<<<<< Updated upstream
 PRD (PM) → Architecture (Architect)
   → create-epics-and-stories (PM)  ← V6: After architecture!
   → implementation-readiness (Architect)
@@ -142,7 +141,6 @@ PRD (PM) → Architecture (Architect)
       → story loop (SM/DEV)
       → retrospective (SM)
   → [Next Epic]
-=======
 Current Phase: 4 (Implementation)
 Current Epic: Epic 1 (Authentication)
 Current Sprint: Sprint 1
@@ -190,108 +188,12 @@ See: [workflow-status instructions](../workflows/workflow-status/instructions.md
 
 See: [document-project reference](./workflow-document-project-reference.md)
 
----
-
-## Story Lifecycle Visualization
-
-```
-┌─────────────────────────────────────────────────────────────┐
-│ PHASE 4: IMPLEMENTATION (Iterative Story Lifecycle)        │
-└─────────────────────────────────────────────────────────────┘
-
-┌─────────────────┐
-│ Sprint Planning │  → Creates sprint-status.yaml
-└────────┬────────┘     Defines story queue
-         │
-         ├──────────────────────────────────────────┐
-         │                                          │
-         ▼                                          │
-┌─────────────────────┐                            │
-│ Epic Tech Context   │  → Optional per epic       │
-│ (Once per epic)     │     Provides technical     │
-└─────────────────────┘     guidance              │
-         │                                          │
-         ▼                                          │
-┌─────────────────────────────────────────────────┤
-│ FOR EACH STORY IN QUEUE:                        │
-├─────────────────────────────────────────────────┤
-         │                                          │
-         ▼                                          │
-┌─────────────────┐                                │
-│ Create Story    │  → Generates story file        │
-│ (TODO → IN PROGRESS)                            │
-└────────┬────────┘                                │
-         │                                          │
-         ▼                                          │
-┌─────────────────┐                                │
-│ Story Context   │  → Assembles focused context   │
-└────────┬────────┘                                │
-         │                                          │
-         ▼                                          │
-┌─────────────────┐                                │
-│ Dev Story       │  → Implements + tests           │
-│ (IN PROGRESS)   │                                │
-└────────┬────────┘                                │
-         │                                          │
-         ▼                                          │
-┌─────────────────┐                                │
-│ Code Review     │  → Senior dev review            │
-│ (IN PROGRESS →  │                                │
-│  READY FOR REVIEW)                               │
-└────────┬────────┘                                │
-         │                                          │
-    ┌────┴────┐                                    │
-    │ Result? │                                    │
-    └────┬────┘                                    │
-         │                                          │
-    ┌────┼────────────────────┐                   │
-    │    │                    │                   │
-    ▼    ▼                    ▼                   │
-APPROVED  APPROVED           REQUEST              │
-          WITH COMMENTS      CHANGES              │
-    │         │                   │                │
-    └─────────┴───────────────────┘               │
-              │                                    │
-              ▼                                    │
-    ┌─────────────────┐                           │
-    │ Story Done      │  → READY FOR REVIEW → DONE│
-    └────────┬────────┘                           │
-             │                                     │
-             ├─────────────────────────────────────┘
-             │ More stories?
-             │
-             ▼
-    ┌────────────────┐
-    │ Epic Complete? │
-    └────────┬───────┘
-             │
-        ┌────┼────┐
-        │         │
-       Yes       No
-        │         └──> Continue to next story
-        │
-        ▼
-┌─────────────────┐
-│ Retrospective   │  → Review epic, lessons learned
-└─────────────────┘
-        │
-        ▼
-    All epics done?
-        │
-       Yes → PROJECT COMPLETE
->>>>>>> Stashed changes
-```
-
----
-
 ## Related Documentation
 
 - [Phase 1: Analysis Workflows](./workflows-analysis.md)
 - [Phase 2: Planning Workflows](./workflows-planning.md)
 - [Phase 3: Solutioning Workflows](./workflows-solutioning.md)
 
----
-
 ## Troubleshooting
 
 **Q: Which workflow should I run next?**
@@ -306,6 +208,4 @@ A: Not recommended. Complete one story's full lifecycle before starting the next
 **Q: What if code review finds issues?**
 A: DEV runs `dev-story` to make fixes, re-runs tests, then runs `code-review` again until it passes.
 
----
-
 _Phase 4 Implementation - One story at a time, done right._