Update to fstack

{
  "description": "Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution",
  "included_files": [],
  "name": "fix-merge-conflicts",
  "skill_md_contents": "---\r\nname: fix-merge-conflicts\r\ndescription: Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution\r\nmenu-description: non-interactively resolve merge conflicts, validate, finalize\r\n---\r\n\r\n# Fix merge conflicts\r\n\r\n## Trigger\r\n\r\nBranch has unresolved merge conflicts and needs a reliable path to a buildable state.\r\n\r\n## Workflow\r\n\r\n1. Detect all conflicting files from git status and conflict markers.\r\n2. Resolve each conflict with minimal, correctness-first edits.\r\n3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.\r\n4. Regenerate lockfiles with package manager tools instead of hand-editing.\r\n5. Run compile, lint, and relevant tests.\r\n6. Stage resolved files and summarize key decisions.\r\n\r\n## Guardrails\r\n\r\n- Keep changes minimal and readable.\r\n- Do not leave conflict markers in any file.\r\n- Avoid broad refactors while resolving conflicts.\r\n- Do not push or tag during conflict resolution.\r\n\r\n## Output\r\n\r\n- Files resolved\r\n- Notable resolution choices\r\n- Build/test outcome\r\n"
}