Fix merge upstream