Atom for Mac - Github Merge Upstream Master in Atom

I’m working on a forked repository in Atom that gets periodic updates from the upstream master. Is there a way to merge the upstream changes into my clone of the repository in Atom?