Merge Conflict Resolution Tea Tin

Two branches. Both correct. Neither compatible. This happens in code and it happens in your nervous system, and in both cases the resolution requires patience, clear headers, and something warm to drink while you figure out which version is actually right.

Three loose-leaf teas: ACCEPT CURRENT (robust Assam — for when you're confident you know better), ACCEPT INCOMING (delicate white peony — for when you probably don't), and ACCEPT BOTH SOMEHOW (complex oolong — for the 4pm Friday merge you'll regret either way). 30g each. Hinged tin, CONFLICT printed on lid.

Does not resolve conflicts automatically. Neither does git.