From 6a62ac45606ddacb67754182ea49f84022889853 Mon Sep 17 00:00:00 2001
From: Derek Collison <derek@nats.io>
Date: Sat, 18 Feb 2023 11:12:15 -0800
Subject: [PATCH] Fix for merge conflict

Signed-off-by: Derek Collison <derek@nats.io>
---
 server/jetstream_cluster.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/jetstream_cluster.go b/server/jetstream_cluster.go
index 7cf4a332..271797e9 100644
--- a/server/jetstream_cluster.go
+++ b/server/jetstream_cluster.go
@@ -3640,7 +3640,7 @@ func (js *jetStream) processClusterCreateConsumer(ca *consumerAssignment, state
 	var didCreate, isConfigUpdate, needsLocalResponse bool
 	if o == nil {
 		// Add in the consumer if needed.
-		if o, err = mset.addConsumerWithAssignment(ca.Config, ca.Name, ca, false) {
+		if o, err = mset.addConsumerWithAssignment(ca.Config, ca.Name, ca, false); err == nil {
 			didCreate = true
 		}
 	} else {