diff --git a/pkg/server/api_registration.go b/pkg/server/api_registration.go
index 9ff7981b..45bb275b 100644
--- a/pkg/server/api_registration.go
+++ b/pkg/server/api_registration.go
@@ -24,12 +24,7 @@ import (
 	"io"
 	"net/http"
 	"path"
-<<<<<<< HEAD
-=======
-	"regexp"
-	"strings"
 	"time"
->>>>>>> b7c0db2e (Wait on NetworkConfigReady condition)
 
 	"github.com/gorilla/websocket"
 	"gopkg.in/yaml.v3"