Fix merge conflicts

Trigger

Branch has unresolved merge conflicts and needs a reliable path to a buildable state.

Inspect the merge or rebase state, its history, and every conflicting file.
Trace each side to its primary sources: commits, pull requests, issues, and the code that establishes the intended behavior.
Resolve each conflict with minimal, correctness-first edits. Preserve both intents when they are compatible. Otherwise, follow the operation's goal and record the trade-off. Do not invent new behavior.
Regenerate lockfiles with package manager tools instead of hand-editing.
Run compile, lint, and relevant tests.
Stage every resolved file and verify that no conflict marker remains.
Finish the merge or continue the rebase until the operation is complete. Resolve and verify each additional conflict before continuing.