diff --git a/cmds/identityd/main.go b/cmds/identityd/main.go
index 3e15c018..941ea65f 100644
--- a/cmds/identityd/main.go
+++ b/cmds/identityd/main.go
@@ -47,10 +47,9 @@ func main() {
 		ver      bool
 		debug    bool
 
-		id      bool
-		net     bool
-		farm    bool
-		address bool
+		id   bool
+		net  bool
+		farm bool
 	)
 
 	flag.StringVar(&root, "root", "/var/cache/modules/identityd", "root working directory of the module")
@@ -61,7 +60,6 @@ func main() {
 	flag.BoolVar(&id, "id", false, "[deprecated] prints the node ID and exits")
 	flag.BoolVar(&net, "net", false, "prints the node network and exits")
 	flag.BoolVar(&farm, "farm", false, "prints the node farm id and exits")
-	flag.BoolVar(&address, "address", false, "prints the node ss58 address and exits")
 
 	flag.Parse()
 	if ver {
@@ -78,7 +76,7 @@ func main() {
 		env := environment.MustGet()
 		fmt.Println(env.RunningMode.String())
 		os.Exit(0)
-	} else if id || address {
+	} else if id {
 		ctx := context.Background()
 		if err != nil {
 			log.Fatal().Err(err).Msg("failed to connect to zbus")
diff --git a/go.sum b/go.sum
index db43b019..8a7f5873 100644
--- a/go.sum
+++ b/go.sum
@@ -565,11 +565,6 @@ github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.1-0.20241229121208-76ac3
 github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.1-0.20241229121208-76ac3fea5e67/go.mod h1:93SROfr+QjgaJ5/jIWtIpLkhaD8Pv8WbdfwvwMNG2p4=
 github.com/threefoldtech/zbus v1.0.1 h1:3KaEpyOiDYAw+lrAyoQUGIvY9BcjVRXlQ1beBRqhRNk=
 github.com/threefoldtech/zbus v1.0.1/go.mod h1:E/v/xEvG/l6z/Oj0aDkuSUXFm/1RVJkhKBwDTAIdsHo=
-<<<<<<< HEAD
-github.com/threefoldtech/zosbase v0.1.1-0.20250130080014-2e99f5f153a9 h1:aWYHEhqUCBG61rbB9udai5oQVQZz6SA4za4/6ENgOPs=
-github.com/threefoldtech/zosbase v0.1.1-0.20250130080014-2e99f5f153a9/go.mod h1:rxc49wA04S4IsBOYe0omVO7nu7GXridueh2PJh34gSo=
-=======
->>>>>>> 1efcc589 (add registrar gateway)
 github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
 github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=