chore(merge_pr): compare to upstream/master

Also fixes some old comments to canary instead of stable.