Fix merge conflict

Created by: eseliger

Broke the build on master: https://buildkite.com/sourcegraph/sourcegraph/builds/65735#a516775e-2547-4302-b9a1-ef5965ba9fb8