diff --git a/controller.go b/controller.go
index cc648ed38b27c56f104f243f2c83fa0573ac92ce..0f5b4085ff4c49fdad703419cdcb262e57ad227b 100644
--- a/controller.go
+++ b/controller.go
@@ -1,7 +1,6 @@
 package gosdn
 
 import (
-	spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
 	"context"
 	"net"
 	"net/http"
diff --git a/northbound/server/pnd.go b/northbound/server/pnd.go
index 23f8e55247d667c1fdf2808a54cf65086782483d..00bd6e0b44817f827fb76aa3d4a24ff50acd58ef 100644
--- a/northbound/server/pnd.go
+++ b/northbound/server/pnd.go
@@ -288,11 +288,7 @@ func handleSetSbi(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetSbi) (*ppb.S
 }
 
 func handleSetChange(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetChange) (*ppb.SetResponse, error) {
-<<<<<<< HEAD
 	for _, r := range req {
-=======
-	for _,r := range req {
->>>>>>> 4a937a94 (nbi implementation done)
 		cuid, err := uuid.Parse(r.Cuid)
 		if err != nil {
 			return nil, err
@@ -320,11 +316,7 @@ func handleSetChange(pnd nucleus.PrincipalNetworkDomain, req []*ppb.SetChange) (
 }
 
 func handleChangeRequest(pnd nucleus.PrincipalNetworkDomain, req []*ppb.ChangeRequest) (*ppb.SetResponse, error) {
-<<<<<<< HEAD
 	for _, r := range req {
-=======
-	for _,r := range req {
->>>>>>> 4a937a94 (nbi implementation done)
 		did, err := uuid.Parse(r.Id)
 		if err != nil {
 			return nil, err
diff --git a/nucleus/change.go b/nucleus/change.go
index baadc1afcbe03a923d9fe44111854773a3120098..231f217046e7a46253287c4e66729c0682b69313 100644
--- a/nucleus/change.go
+++ b/nucleus/change.go
@@ -1,7 +1,6 @@
 package nucleus
 
 import (
-	ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
 	"errors"
 	"os"
 	"sync"
diff --git a/nucleus/gnmi_transport.go b/nucleus/gnmi_transport.go
index c293bc3eb23e96e124a61afa4c33b56e0a1e81fd..1834ce7e13e9acd6e5bf2ea7871b960f01bf3d98 100644
--- a/nucleus/gnmi_transport.go
+++ b/nucleus/gnmi_transport.go
@@ -1,7 +1,6 @@
 package nucleus
 
 import (
-	ppb "code.fbi.h-da.de/cocsn/api/go/gosdn/pnd"
 	"context"
 	"reflect"
 
diff --git a/nucleus/gnmi_transport_test.go b/nucleus/gnmi_transport_test.go
index 6e61ffe3abc317ee8f6fb01e96b2208783d90626..e7fa677b5aae2a04ec83c399e778df1936c9cdb7 100644
--- a/nucleus/gnmi_transport_test.go
+++ b/nucleus/gnmi_transport_test.go
@@ -9,9 +9,6 @@ import (
 	spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
 	tpb "code.fbi.h-da.de/cocsn/api/go/gosdn/transport"
 
-	spb "code.fbi.h-da.de/cocsn/api/go/gosdn/southbound"
-	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/yang-models/generated/openconfig"