Fix merge conflicts

Signed-off-by: Jose Fuentes <[email protected]>

Author: j-fuentes

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/open-policy-agent/opa v0.16.0
 	github.com/pkg/errors v0.8.1
 	github.com/spf13/cobra v0.0.5
-	github.com/spf13/pflag v1.0.3
+	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.5.0
 	github.com/yudai/gojsondiff v1.0.0
 	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6