diff --git a/client/cmd/login.go b/client/cmd/login.go
index 90667026d..fb1232325 100644
--- a/client/cmd/login.go
+++ b/client/cmd/login.go
@@ -17,11 +17,8 @@ import (
 	"github.com/netbirdio/netbird/client/internal"
 	"github.com/netbirdio/netbird/client/internal/auth"
 	"github.com/netbirdio/netbird/client/internal/profilemanager"
-<<<<<<< ours
 	"github.com/netbirdio/netbird/client/mdm"
-=======
 	nbnet "github.com/netbirdio/netbird/client/net"
->>>>>>> theirs
 	"github.com/netbirdio/netbird/client/proto"
 	"github.com/netbirdio/netbird/client/server"
 	"github.com/netbirdio/netbird/client/system"
diff --git a/client/ios/NetBirdSDK/client.go b/client/ios/NetBirdSDK/client.go
index e46a6058f..622e9d7fa 100644
--- a/client/ios/NetBirdSDK/client.go
+++ b/client/ios/NetBirdSDK/client.go
@@ -84,18 +84,16 @@ type Client struct {
 	// preloadedConfig holds config loaded from JSON (used on tvOS where file writes are blocked)
 	preloadedConfig *profilemanager.Config
 
-<<<<<<< ours
 	// mdmLoader holds the per-Client MDM policy source. Set by
 	// SetMDMPolicyFetcher (called from the Swift side at extension
 	// init). Each Run passes this loader to the resolved Config so
 	// applyMDMPolicy picks up the active overlay. Nil means "MDM
 	// enforcement off for this Client".
 	mdmLoader *mdm.Loader
-=======
+
 	stateMu       sync.RWMutex
 	connectClient *internal.ConnectClient
 	config        *profilemanager.Config
->>>>>>> theirs
 }
 
 // NewClient instantiate a new Client
diff --git a/client/server/setconfig_mdm_test.go b/client/server/setconfig_mdm_test.go
index b30e54142..fa29655b7 100644
--- a/client/server/setconfig_mdm_test.go
+++ b/client/server/setconfig_mdm_test.go
@@ -131,15 +131,6 @@ func TestSetConfig_MDMReject_SingleField(t *testing.T) {
 }
 
 func TestSetConfig_MDMReject_MultipleFields(t *testing.T) {
-<<<<<<< ours
-=======
-	withMDMPolicy(t, mdm.NewPolicy(map[string]any{
-		mdm.KeyManagementURL:    "https://mdm.example.com:443",
-		mdm.KeyBlockInbound:     true,
-		mdm.KeyRosenpassEnabled: true,
-	}))
-
->>>>>>> theirs
 	s, ctx, profName, username, _ := setupServerWithProfile(t)
 	withMDMPolicy(t, s, mdm.NewPolicy(map[string]any{
 		mdm.KeyManagementURL:    "https://mdm.example.com:443",
@@ -229,12 +220,11 @@ func TestSetConfig_MDMAllow_ManagementURLPortNormalized(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
-			withMDMPolicy(t, mdm.NewPolicy(map[string]any{
+			s, ctx, profName, username, _ := setupServerWithProfile(t)
+			withMDMPolicy(t, s, mdm.NewPolicy(map[string]any{
 				mdm.KeyManagementURL: tc.mdmURL,
 			}))
 
-			s, ctx, profName, username, _ := setupServerWithProfile(t)
-
 			rosenpassEnabled := true
 			resp, err := s.SetConfig(ctx, &proto.SetConfigRequest{
 				ProfileName:      profName,