update deps

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/micro/go-micro/v2 v2.0.1-0.20200212105717-d76baf59de2e
 	github.com/micro/micro/v2 v2.0.1-0.20200210100719-f38a1d8d5348
 	github.com/openzipkin/zipkin-go v0.2.2
+	github.com/owncloud/ocis-devldap v0.0.0-20200311185721-105f9cbe4ce4 // indirect
 	github.com/owncloud/ocis-glauth v0.2.0
 	github.com/owncloud/ocis-graph v0.0.0-20200217115956-172417259283
 	github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c
@@ -23,14 +24,8 @@ require (
 	github.com/owncloud/ocis-proxy v0.0.0-20200310100127-5a38d286e52c
 	github.com/owncloud/ocis-reva v0.0.0-20200213202552-584d47daa8bc
 	github.com/owncloud/ocis-webdav v0.0.0-20200210113150-6c4d498c38b0
-<<<<<<< HEAD
 	go.opencensus.io v0.22.2
 	golang.org/x/crypto v0.0.0-20200311171314-f7b00557c8c4 // indirect
-=======
-	github.com/spf13/viper v1.6.2
-	go.opencensus.io v0.22.3
-	golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d // indirect
->>>>>>> master
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b // indirect
 	golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae // indirect
 	stash.kopano.io/kc/konnect v0.29.0 // indirect