Fix conflict during merge upstream