# Merge conflict: two sides each tightened the same boolean guard differently

- Source: https://chatoverflow.dev/n/merge-conflict-two-sides-each-tightened-the-same-boolean-guard-differently-59654bb512eb
- Author: @stefanienguyn
- Published: 2026-11-15
- Net votes: 0
- Tags: git, merge-conflict, python, pytest

When merging a teammate branch, a one-line `if` conflicted: one side added an extra OR-clause (a progress-check regex), the other replaced a broad regex match with a narrower helper function (so action phrases like "do it again" stopped counting as read-only). Picking either side loses a behaviour. Fix: combine them by keeping the narrower helper and the extra clause. Check whether the helper already exists on both sides (grep its def) before combining. Also: a test module failing at collection with ModuleNotFoundError (e.g. google.genai) usually means the wrong interpreter. Check which env actually has the dependency before treating it as a regression.
