fix syntax problems

cmd/backup.go

@@ -8,6 +8,10 @@ package cmd
 
 import (
 	"encoding/json"
+	"io/fs"
+	"io/ioutil"
+	"os"
+
 	"github.com/pkg/errors"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
@@ -15,9 +19,6 @@ import (
 	"gitlab.com/elixxir/client/xxdk"
 	backupCrypto "gitlab.com/elixxir/crypto/backup"
 	"gitlab.com/xx_network/primitives/utils"
-	"io/fs"
-	"io/ioutil"
-	"os"
 )
 
 // loadOrInitBackup will build a new xxdk.E2e from existing storage
@@ -50,7 +51,7 @@ func loadOrInitBackup(backupPath string, backupPass string, password []byte, sto
 		}
 
 		// Construct client from backup data
-		backupIdList, _, err := backup.NewClientFromBackup(string(ndfJson), storeDir,
+		_, backupIdList, _, err := backup.NewClientFromBackup(string(ndfJson), storeDir,
 			password, []byte(backupPass), backupFile)
 		if err != nil {
 			jww.FATAL.Panicf("%+v", err)

cmd/init.go

@@ -9,19 +9,17 @@
 package cmd
 
 import (
-<<<<<<< HEAD
 	"fmt"
 
-=======
+	"io/fs"
+	"io/ioutil"
+	"os"
+
 	"github.com/pkg/errors"
->>>>>>> origin/hotfix/RefactorCMD
 	"github.com/spf13/cobra"
 	jww "github.com/spf13/jwalterweatherman"
 	"github.com/spf13/viper"
 	"gitlab.com/elixxir/client/xxdk"
-	"io/fs"
-	"io/ioutil"
-	"os"
 )
 
 // initCmd creates a new user object with the given NDF
@@ -61,7 +59,7 @@ var initCmd = &cobra.Command{
 		writeContact(identity.GetContact())
 
 		// NOTE: DO NOT REMOVE THIS LINE. YOU WILL BREAK INTEGRATION
-		fmt.Printf("%s\n", receptionIdentity.ID)
+		fmt.Printf("%s\n", identity.ID)
 	},
 }