I don't know whether that means we need to land one, then rebase, then land the other, or whether github has a nice way of landing them both as separate commits without a merge commit