If I could do this once, and not mess it up

I would be so happy.
Merge remote-tracking branch 'upstream/master'