Some asshole left me a huge merge conflict from last Friday to resolve this Monday morning.
(It's me; I'm the asshole.)