From 1d64404a74a80e6a05115569a5d174330ce91058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Papp?= <zoltan.pmail@gmail.com>
Date: Thu, 11 Jun 2026 18:49:39 +0200
Subject: [PATCH] Fix merge conflict

---
 client/internal/engine.go | 9 ++-------
 go.mod                    | 1 +
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/client/internal/engine.go b/client/internal/engine.go
index dfc4f1990..a594dbd9d 100644
--- a/client/internal/engine.go
+++ b/client/internal/engine.go
@@ -240,7 +240,7 @@ type Engine struct {
 	syncStore    syncstore.Store
 	syncStoreDir string
 
-	flowManager         nftypes.FlowManager
+	flowManager nftypes.FlowManager
 
 	// auto-update
 	updateManager *updater.Manager
@@ -929,18 +929,13 @@ func (e *Engine) handleSync(update *mgmProto.SyncResponse) error {
 		return err
 	}
 
-	nm := update.GetNetworkMap()
-	if nm == nil {
-		return nil
-	}
+	e.persistSyncResponse(update)
 
 	// only apply new changes and ignore old ones
 	if err := e.updateNetworkMap(nm); err != nil {
 		return err
 	}
 
-	e.persistSyncResponse(update)
-
 	e.statusRecorder.PublishEvent(cProto.SystemEvent_INFO, cProto.SystemEvent_SYSTEM, "Network map updated", "", nil)
 
 	return nil
diff --git a/go.mod b/go.mod
index 09b9b27d3..983b81d6e 100644
--- a/go.mod
+++ b/go.mod
@@ -213,6 +213,7 @@ require (
 	github.com/go-webauthn/x v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/btree v1.1.3 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/go-tpm v0.9.8 // indirect