From 299abeb25dd4d17e4432c214df2c0ea291cd0a92 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Tue, 27 Jun 2023 11:03:49 -0400
Subject: [PATCH] Apply merge mode change to 1.18

---
 .../java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java b/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
index 33e9daf6..e0d933e4 100644
--- a/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
+++ b/common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java
@@ -71,7 +71,7 @@ public class SparkLaunchProfiler {
             SparkSamplerProtos.SamplerData output = sampler.toProto(platform, new Sampler.ExportProps()
                     .creator(new CommandSender.Data(commandSender.getName(), commandSender.getUniqueId()))
                     .comment("Stage: " + key)
-                    .mergeMode(() -> MergeMode.separateParentCalls(new MethodDisambiguator()))
+                    .mergeMode(() -> MergeMode.sameMethod(new MethodDisambiguator()))
                     .classSourceLookup(platform::createClassSourceLookup));
             try {
                 String urlKey = platform.getBytebinClient().postContent(output, "application/x-spark-sampler").key();