fix merge error in config.go
fix merge error in config.go

Signed-off-by: justin-slowik <6d3b0fbd9fe31a26a2153a7edf98fc4988c41594@thermofisher.com>

ericchiang/dex,ericchiang/dex,coreos/dex,coreos/dex,coreos/dex,ericchiang/dex