diff --git a/northbound/server/pnd.go b/northbound/server/pnd.go
index 00bd6e0b44817f827fb76aa3d4a24ff50acd58ef..ea12031e1c71d292fe97c1ee488108ee5b2c65b6 100644
--- a/northbound/server/pnd.go
+++ b/northbound/server/pnd.go
@@ -163,7 +163,7 @@ func fillOnds(pnd nucleus.PrincipalNetworkDomain, all bool, did ...string) ([]*p
 
 	onds := make([]*ppb.OrchestratedNetworkingDevice, len(ondList))
 	for i, id := range ondList {
-		d, err := pnd.GetDevice(id)
+		d, err := pnd.GetDevice(id.String())
 		if err != nil {
 			return nil, err
 		}
diff --git a/nucleus/change.go b/nucleus/change.go
index 231f217046e7a46253287c4e66729c0682b69313..c9f0c41e7417f7efc281d7f6fb3e8fcd89b8fcdb 100644
--- a/nucleus/change.go
+++ b/nucleus/change.go
@@ -146,4 +146,4 @@ func (c *Change) State() ppb.Change_State {
 	} else {
 		return ppb.Change_CONFIRMED
 	}
-}
\ No newline at end of file
+}
diff --git a/nucleus/initialise_test.go b/nucleus/initialise_test.go
index f105c68693385ca54b6407bc9ea08a5f1b98dc8f..e412a631d0ea6f43169842a1b924a3db4f85ab62 100644
--- a/nucleus/initialise_test.go
+++ b/nucleus/initialise_test.go
@@ -7,8 +7,6 @@ import (
 
 	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
 
-	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
-
 	"code.fbi.h-da.de/cocsn/gosdn/forks/goarista/gnmi"
 	"code.fbi.h-da.de/cocsn/gosdn/mocks"
 	"code.fbi.h-da.de/cocsn/gosdn/nucleus/util/proto"
diff --git a/test/integration/cmdIntegration_test.go b/test/integration/cmdIntegration_test.go
index e81b3c9875b65211eafdca367c4af52586e0cbab..b91547203d7098d66689cfe13eed1d8bb7d11992 100644
--- a/test/integration/cmdIntegration_test.go
+++ b/test/integration/cmdIntegration_test.go
@@ -1,7 +1,6 @@
 package integration
 
 import (
-	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
 	"os"
 	"testing"
 
diff --git a/test/integration/nucleusIntegration_test.go b/test/integration/nucleusIntegration_test.go
index 294c6546e4f08e2befe4d5478036e09263e10798..4a5a29eebeb8d7acb0c0fdf7310314b83000694a 100644
--- a/test/integration/nucleusIntegration_test.go
+++ b/test/integration/nucleusIntegration_test.go
@@ -1,8 +1,6 @@
 package integration
 
 import (
-	spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
-	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
 	"context"
 	"reflect"
 	"sort"
@@ -228,11 +226,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
 			name: "destination unreachable",
 			fields: fields{
 				opt: &tpb.TransportOption{
-<<<<<<< HEAD
 					Address: "203.0.113.10:6030",
-=======
-						Address: "203.0.113.10:6030",
->>>>>>> 4a937a94 (nbi implementation done)
 				},
 			},
 			args: args{
@@ -309,11 +303,7 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) {
 		{
 			name: "destination unreachable",
 			fields: fields{opt: &tpb.TransportOption{
-<<<<<<< HEAD
 				Address: "203.0.113.10:6030",
-=======
-					Address: "203.0.113.10:6030",
->>>>>>> 4a937a94 (nbi implementation done)
 			},
 			},
 			args:    args{ctx: context.Background()},