Yup.  E.g. if you just cloned your fork and didn't add a remote for upstream, then do the following

```
git remote add upstream git@github.com:Shopify/shopify_django_app.git
git fetch upstream
git rebase upstream/master
```

or if you cloned the repo with `git clone git@github.com:Shopify/shopify_django_app.git` then just do

```
git fetch origin
git rebase origin/master
```

Currently this branch can't be automatically merged due to merge conflicts.