manual merge upstream