Fix Merge Conflicts

Resolves conflicts that arise from git merge, git rebase, git cherry-pick, git revert, git stash pop or git am. The guiding principle: a conflict is a question about intent, not about text. Both sides changed the same region because both sides wanted something. The resolution must preserve both intents, or explicitly and knowingly drop one of them.

Never resolve a conflict by picking whichever side makes the markers disappear fastest.

Completion criterion

The task is done when:

1. git status reports no unmerged paths and no remaining conflict markers exist anywhere in the working tree (see Step 7).
2. The project builds and its tests pass (see Step 8).
3. Every non-obvious resolution decision — especially every place where one side's change was intentionally dropped — has been reported to the user.