Fix Merge Conflicts

Resolve conflicts by understanding what each side meant and keeping the behavior both intended — not by blindly taking one side or concatenating both. After resolving, regenerate any derived files and confirm the tree still builds and tests pass before the merge/rebase is allowed to continue.

Contract

Inputs:

• A repository stopped mid-conflict (unmerged paths present), from a merge, rebase, cherry-pick, or stash pop
• Optional scope: specific files to resolve, otherwise all unmerged paths

Outputs: