fix(cmd): Fix merge conflicts

cmd/fossa/cmd/update/update.go

@@ -31,18 +31,18 @@ func Do(c *cli.Context) {
 
 	ok, err := AvailableUpdate()
 	if err != nil {
-		log.Fatalf("Unable to update: %s", err.Error())
+		log.Logger.Fatalf("Unable to update: %s", err.Error())
 	}
 	if !ok {
-		log.Fatalf("No updates available")
+		log.Logger.Fatalf("No updates available")
 	}
 
 	version, err := Update()
 	if err != nil {
-		log.Fatalf("Update failed: %s", err.Error())
+		log.Logger.Fatalf("Update failed: %s", err.Error())
 	}
 
-	log.Notice("fossa has been updated to " + version.String())
+	log.Logger.Notice("fossa has been updated to " + version.String())
 }
 
 func AvailableUpdate() (bool, error) {

cmd/fossa/version/version.go

@@ -9,32 +9,32 @@ import (
 )
 
 var (
-	BuildType string
-	Version   string
-	Commit    string
-	GoVersion string
+	buildType string
+	version   string
+	commit    string
+	goversion string
 )
 
 var ErrIsDevelopment = errors.New("this development binary has no semantic version")
 
 func IsDevelopment() bool {
-	return BuildType == "development"
+	return buildType == "development"
 }
 
 func String() string {
-	return fmt.Sprintf("%s (revision %s compiled with %s)", Version, Commit, GoVersion)
+	return fmt.Sprintf("%s (revision %s compiled with %s)", version, commit, goversion)
 }
 
 func ShortString() string {
 	if IsDevelopment() {
-		return Commit
+		return commit
 	}
-	return Version
+	return version
 }
 
 func Semver() (semver.Version, error) {
 	if IsDevelopment() {
 		return semver.Version{}, ErrIsDevelopment
 	}
-	return semver.Parse(strings.TrimPrefix(Version, "v"))
+	return semver.Parse(strings.TrimPrefix(version, "v"))
 }