merge upstream repo