[Reviewer: Ellie] Fix bad MockHTTPStack merge