Merge conflict fix

Corresponding PR for https://github.com/pulibrary/pul-store/pull/79. Sorry for the vague branch name. I should have numbered it.