Resolve merge conflicts

I’ve hit a merge conflict on files A and B when merging origin/main into my branch. Show the conflicted hunks with context, indicate which side modified each hunk, and produce a suggested merge result that preserves tests and existing behavior; stop before applying changes so I can review.

Before I resolve this conflict for the reviewers, make it easy to pick the right changes: show why each conflict happened by listing the commits on both sides that touched the hunk, flag conflicts that change public API or DB schema, and propose a merge that keeps recent test expectations intact or notes necessary test updates.

I tried resolving merge conflicts in payment_processor.py and now unit tests fail. The other branch’s changes came from Lena and I don’t know which behavior users rely on. I’m afraid I picked the wrong branch for several hunks. What’s the likely misstep and what’s the quickest way to decide which behavior to keep without rolling back my entire resolution?

Merge conflicts repeatedly cost us hours during release merges, especially around shared modules and migrations. Where are we going wrong in our branching or commit habits, and what one process change would reduce the frequency and pain of these conflicts across the team?