* commit merge changes

Author: tschatzl

src/hotspot/share/gc/g1/g1CollectionSet.cpp

@@ -324,15 +324,8 @@ double G1CollectionSet::finalize_young_part(double target_pause_time_ms, G1Survi
 
   verify_young_cset_indices();
 
-<<<<<<< HEAD
   size_t card_rs_length = _policy->analytics()->predict_card_rs_length(in_young_only_phase);
   double predicted_base_time_ms = _policy->predict_base_time_ms(pending_cards, card_rs_length);
-=======
-  size_t num_young_cards = _g1h->young_regions_cardset()->occupied();
-  _policy->record_card_rs_length(num_young_cards);
-
-  double predicted_base_time_ms = _policy->predict_base_time_ms(pending_cards, num_young_cards);
->>>>>>> master
   // Base time already includes the whole remembered set related time, so do not add that here
   // again.
   double predicted_eden_time = _policy->predict_young_region_other_time_ms(eden_region_length) +

src/hotspot/share/gc/g1/g1Policy.hpp

@@ -139,10 +139,6 @@ class G1Policy: public CHeapObj<mtGC> {
     hr->install_surv_rate_group(_survivor_surv_rate_group);
   }
 
-  void record_card_rs_length(size_t num_cards) {
-    _card_rs_length = num_cards;
-  }
-
   double cur_pause_start_sec() const {
     return _cur_pause_start_sec;
   }