Resolve Merge Conflicts

When resolving merge conflicts:

1. Fetch the latest upstream: git fetch origin.
2. Start the rebase or merge: git rebase origin/main (or merge, per project convention).
3. For each conflicted file, open it and read both sides of the conflict completely.
4. Understand the intent of both changes before resolving. Don’t just pick “ours” or “theirs” blindly.
5. Resolve the conflict, keeping the behavior both changes intended. Write new code if needed.
6. Run the tests after resolving each file to catch issues early.
7. After all conflicts are resolved, run the full test suite to verify the combined code works.