git(merging branches): Merges changes from upstream
git(merging branches): Merges changes from upstream

(Or something. I don't think anybody else is working on this code, so
how did it get so messed up and have a merge conflict? I don't know, but
here we are.)

freelawproject/juriscraper,freelawproject/juriscraper