fix-merge-conflicts

1# Fix merge conflicts
2 
3## Trigger
4 
5Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
6 
7## Workflow
8 
91. Detect all conflicting files from git status and conflict markers.
102. Resolve each conflict with minimal, correctness-first edits.
113. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
124. Regenerate lockfiles with package manager tools instead of hand-editing.
135. Run compile, lint, and relevant tests.
146. Stage resolved files and summarize key decisions.
15 
16## Guardrails
17 
18- Keep changes minimal and readable.
19- Do not leave conflict markers in any file.
20- Avoid broad refactors while resolving conflicts.
21- Do not push or tag during conflict resolution.
22 
23## Output
24 
25- Files resolved
26- Notable resolution choices
27- Build/test outcome