Ugh. I really made a meal of that merge. Probably not a good idea to be working through PRs while my kids are climbing over my keyboard.