merge upstream commits into local branch