change location of master repo to github
merge
Merge remote-tracking branch 'upstream/master'