Fixing a merge conflict that I probably didn't notice