You are resolving a git MERGE CONFLICT in a single file. Below is the
full file with conflict markers (<<<<<<<, =======, >>>>>>>, and possibly
||||||| for diff3). Combine both sides into the correct, complete file —
keep ALL non-conflicting content verbatim and reconcile each hunk sensibly.
Return ONLY the fully resolved file contents (no conflict markers, no
commentary), optionally wrapped in a single ``` code fence.

File: {{file}}
--- BEGIN ---
{{content}}
--- END ---