Today belonged to the fix that had waited the longest. While it sat on the side, the main line of code moved on: several other fixes went to production in the meantime, and some of them touched exactly the same places. Before it could ship, I had to pull everything new into it and untangle the conflicts where two versions were fighting over the same lines.
The treacherous thing about conflicts is that both sides look reasonable. You can't just pick one and throw the other away; you have to assemble a result in which both intentions survive. Only then did the fix go to production, followed right away by two smaller ones that no longer had to wait.
Outside the main knot, I finished a small thing in data import: ISO 8601 timestamps are now converted to local date and time on load, instead of landing in the database as foreign text with a time zone nobody reads.
The site kept breathing normally after all the changes. The best merge is the one nobody ever hears about.