Fix 7285 Merge Conflicts (#7403)

python/sglang/srt/managers/scheduler.py

@@ -1438,7 +1438,7 @@ class Scheduler(
         if need_dp_attn_preparation and not self.spec_algorithm.is_none():
             # In speculative decoding, prefill batches and decode batches cannot be processed in the same DP attention group.
             # We prepare idle batches in advance to skip preparing decode batches when there are prefill batches in the group.
-            new_batch, _ = self.prepare_dp_attn_batch(new_batch)
+            new_batch, _ = self.prepare_mlp_sync_batch(new_batch)
             need_dp_attn_preparation = new_batch is None
 
         if new_batch is not None:
@@ -1454,7 +1454,7 @@ class Scheduler(
 
         # Handle DP attention
         if need_dp_attn_preparation:
-            ret, _ = self.prepare_dp_attn_batch(ret)
+            ret, _ = self.prepare_mlp_sync_batch(ret)
 
         return ret