MERGE CONFLICT

n.

A brutal standoff between incoming changes and your sanity.

▶ See also: APOCALYPSE PULL