message: fix conflict with commit
diff: @@ -501,9 +501,24 @@ Status DatasetBaseIterator::Skip(IteratorContext* ctx, int num_to_skip,
  profiler::TraceMe activity([&] { return BuildTraceMeName(); },
  profiler::TraceMeLevel::kInfo);
  DVLOG(3) << prefix() << " Skip enter";
  - RecordStart(ctx, /*stop_output=*/true);
  + auto model = ctx->model();
  + if (model && model->collect_resource_usage() && node_) {
  + int64 now_nanos = EnvTime::NowNanos();
  + auto output = node_->output();
  + if (output) {
  + output->record_stop(now_nanos);
  + }
  + node_->record_start(now_nanos);
  + }
  Status s = SkipInternal(ctx, num_to_skip, end_of_sequence, num_skipped);
  - RecordStop(ctx, /*start_output=*/true);
  + if (model && model->collect_resource_usage() && node_) {
  + int64 now_nanos = EnvTime::NowNanos();
  + node_->record_stop(now_nanos);
  + auto output = node_->output();
  + if (output) {
  + output->record_start(now_nanos);
  + }
  + }
  if (TF_PREDICT_FALSE(errors::IsOutOfRange(s))) {
  s = errors::Internal("Iterator \"", params_.prefix,
  "\" returned `OutOfRange`. This indicates an "
  