merge upstream downstream