more leftover merge conflicts (oops)