git merge upstream/master