7. Conflict resolution

Types: task conflict (what to do), process conflict (how), relationship conflict (personal). Healthy task conflict improves decisions; relationship conflict must be addressed quickly.

Approach:

1. Talk to each person privately; understand interests behind positions.
2. Bring them together; set ground rules; focus on facts and shared goals (customer, quality, deadline).
3. Generate options; decide using agreed criteria (data, spike/prototype, architecture principles) — or the lead decides if needed ("disagree and commit").
4. Document the decision (ADR) and follow up.

Thomas-Kilmann modes: competing, collaborating, compromising, avoiding, accommodating — collaborating is ideal for important issues; compromising when time is short.