Index: tools/Code_Report.csv
===================================================================
diff -u -r32001abdfb62770761771b563eb6ff517152fc76 -r7c2abe8c09eacc9c5a1c62e7f67ad7797222ad8c
--- tools/Code_Report.csv	(.../Code_Report.csv)	(revision 32001abdfb62770761771b563eb6ff517152fc76)
+++ tools/Code_Report.csv	(.../Code_Report.csv)	(revision 7c2abe8c09eacc9c5a1c62e7f67ad7797222ad8c)
@@ -53,11 +53,7 @@
 ./dg/cpld.py, Function, get_cpld_clean_led(self) -> int:
 ./dg/dialysate_fill.py, Function, cmd_used_bicarb_volume_override(self, volume: float) -> int:
 ./dg/dialysate_fill.py, Function, cmd_fill_mode_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
-<<<<<<< HEAD
-./dg/dialysate_fill.py, Function, cmd_dialysate_fill_total_volume_override(self, volume: float, reset: int = NO_RESET) -> int:
-=======
 ./dg/dialysate_fill.py, Function, cmd_dialysate_fill_integrated_volume_override(self, volume: float, reset: int = NO_RESET) -> int:
->>>>>>> DEN-14559-dg_hd_dev-hd_dg_dvt-update-part-8
 ./dg/dialysate_fill.py, Function, get_fill_mode_data(self):
 ./dg/dialysate_fill.py, Function, cmd_used_acid_volume_override(self, volume: float) -> int:
 ./dg/dialysate_generator.py, Function, get_version(self):
@@ -645,9 +641,6 @@
 dg/chemical_disinfect_flush.py, Variable, flush_state
 dg/chemical_disinfect_flush.py, Variable, overall_elapsed_time
 dg/chemical_disinfect_flush.py, Variable, state_elapsed_time
-dg/chemical_disinfect_flush.py, Variable, r1
-dg/chemical_disinfect_flush.py, Variable, r2
-dg/chemical_disinfect_flush.py, Variable, target_rinse_count
 dg/chemical_disinfect_flush.py, Variable, rinse_count
 dg/chemical_disinfect_flush.py, Variable, flush_UI_state
 dg/chemical_disinfect.py, Variable, chemical_disinfect_state
@@ -658,8 +651,6 @@
 dg/chemical_disinfect.py, Variable, cancellation_mode
 dg/chemical_disinfect.py, Variable, r1_level
 dg/chemical_disinfect.py, Variable, r2_level
-dg/chemical_disinfect.py, Variable, target_post_rinse_count
-dg/chemical_disinfect.py, Variable, current_post_rinse_count
 dg/chemical_disinfect.py, Variable, chemical_disinfect_ui_state
 dg/concentrate_pumps.py, Variable, concentrate_pump_cp1_current_set_speed
 dg/concentrate_pumps.py, Variable, concentrate_pump_cp1_measured_speed
@@ -1629,13 +1620,14 @@
 common/dg_defs.py, Enum, DGChemicalDisinfectStates, NUM_OF_DG_CHEM_DISINFECT_STATES
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DGChemDisinfectFlushStates
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_START
-common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R1
-common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_DISINFECTANT_DRAIN_R2
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R1
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_DRAIN_R2
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DRAIN
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_DISINFECTANT_LINE
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_UF
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R2_TO_R1_DRAIN_R1
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_FLUSH_R1_TO_R2_DRAIN_R2
+common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_SAMPLE_FLUSH_R1_TO_R2_DRAIN_R2
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_BASIC_PATH
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_CANCEL_WATER_PATH
 common/dg_defs.py, Enum, DGChemDisinfectFlushStates, DG_CHEM_DISINFECT_FLUSH_STATE_COMPLETE