A situation in **Git** where changes in different branches affect the same lines of code and cannot be automatically combined. Requires manual resolution. (Ch. 31)