resolv conflict

Signed-off-by: bufferflies <1045931706@qq.com>

server/cluster/coordinator.go

@@ -775,16 +775,12 @@ func (s *scheduleController) Stop() {
 
 func (s *scheduleController) Schedule() []*operator.Operator {
  for i := 0; i < maxScheduleRetries; i++ {
-<<<<<<< HEAD
-=======
  // no need to retry if schedule should stop to speed exit
  select {
  case <-s.ctx.Done():
  return nil
  default:
  }
- cacheCluster := opt.NewCacheCluster(s.cluster)
->>>>>>> 49ba6b161 (cluster: speed scheduler exit (#4148))
  // If we have schedule, reset interval to the minimal interval.
  if op := s.Scheduler.Schedule(s.cluster); op != nil {
  s.nextInterval = s.Scheduler.GetMinInterval()