Use same merge mode as default Spark

Author: embeddedt

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

@@ -71,7 +71,7 @@ public static void stop(String key) {
     private static void output(String key, Sampler sampler) {
         executor.execute(() -> {
             ModernFixMixinPlugin.instance.logger.warn("Stage [{}] profiler has stopped! Uploading results...", key);
-            byte[] output = sampler.formCompressedDataPayload(new Sampler.ExportProps(platformInfo, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.separateParentCalls(new MethodDisambiguator()), platform.getClassSourceLookup()));
+            byte[] output = sampler.formCompressedDataPayload(new Sampler.ExportProps(platformInfo, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.sameMethod(new MethodDisambiguator()), platform.getClassSourceLookup()));
             try {
                 String urlKey = SparkPlatform.BYTEBIN_CLIENT.postContent(output, mediaType).key();
                 String url = "https://spark.lucko.me/" + urlKey;

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

@@ -72,7 +72,7 @@ public static void stop(String key) {
     private static void output(String key, Sampler sampler) {
         executor.execute(() -> {
             ModernFixMixinPlugin.instance.logger.warn("Stage [{}] profiler has stopped! Uploading results...", key);
-            SparkSamplerProtos.SamplerData output = sampler.toProto(platform, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.separateParentCalls(new MethodDisambiguator()), platform.createClassSourceLookup());
+            SparkSamplerProtos.SamplerData output = sampler.toProto(platform, commandSender, ThreadNodeOrder.BY_TIME, "Stage: " + key, MergeMode.sameMethod(new MethodDisambiguator()), platform.createClassSourceLookup());
             try {
                 String urlKey = platform.getBytebinClient().postContent(output, mediaType).key();
                 String url = "https://spark.lucko.me/" + urlKey;