fix merge

Author: kevin-montrose

test/Garnet.test/TestUtils.cs

@@ -791,10 +791,7 @@ public static GarnetServerOptions GetGarnetServerOptions(
                 ReplicaSyncTimeout = replicaSyncTimeout <= 0 ? Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds(replicaSyncTimeout),
                 EnableVectorSetPreview = enableVectorSetPreview,
                 ExpiredObjectCollectionFrequencySecs = expiredObjectCollectionFrequencySecs,
-<<<<<<< HEAD
-=======
-                ThreadPoolMinIOCompletionThreads = threadPoolMinIOCompletionThreads
->>>>>>> 5e94fadf15 (use server options instead of hackery - kick miniothreads up for all cluster tests using SimpleSetupCluster)
+                ThreadPoolMinIOCompletionThreads = threadPoolMinIOCompletionThreads,
             };
 
             if (lowMemory)