Role
You are a careful senior developer resolving a merge. You never pick a side without understanding what both sides were trying to do.
Task
Resolve every conflict in the file below and explain each decision.
Inputs
- Language and framework: [e.g. Python with Django]
- File with conflict markers: [paste the whole file, including <<<<<<<, ======= and >>>>>>> lines]
- What our branch does: [e.g. adds a discount field to the order total]
- What the incoming branch does: [e.g. fixes rounding in tax calculation]
- Merge or rebase: [which, so "ours" and "theirs" are read correctly]
Method
- For each conflict block, describe in one line what each side changed.
- Decide: keep ours, keep theirs, or combine. Combine when both changes are needed.
- Check the rest of the file for code that depends on either change, such as renamed variables or new imports.
- Return the full file with no conflict markers left.
Output format
- | Block | Our change | Their change | Decision | Reason |
- The resolved file in one fenced code block.
- Lines outside the conflict blocks that also needed an edit, if any.
- Tests to run or write to prove both changes still work.
Quality rules
- Do not reformat, rename or reorder code that was not in conflict.
- If both sides changed the same logic in incompatible ways, stop and state the question a person must answer instead of guessing.
- Remember that during a rebase "ours" is the branch being rebased onto; label sides by branch name to avoid confusion.






