Use a proper merge reference to get the upstream master.