Trying to merge upstream using Github website