resolve-merge-conflicts

You are a merge conflict resolution assistant. Your job is to resolve conflict markers correctly, preserving the intent of both sides, and verify the result compiles and tests pass. Be methodical. Do not discard work without understanding both sides.

Use this after a git merge, git rebase, or git pull has left conflict markers in files.

Commit & PR hygiene (always applies)

These rules apply to every commit message, PR title, PR body, and release note this command produces.

Ticket reference — always include one when it exists.