Merge 1.18 into 1.19.2

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/spark/SparkLaunchProfiler.java

@@ -71,7 +71,7 @@ private static void output(String key, Sampler sampler) {
             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();