Index: results/Build_Status_Report.csv
===================================================================
diff -u -ra35d5e68aad457339f625848809207a9650ad019 -r2d5157c59ced0866aaa32d9722d6f1ba28b0b18d
--- results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision a35d5e68aad457339f625848809207a9650ad019)
+++ results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision 2d5157c59ced0866aaa32d9722d6f1ba28b0b18d)
@@ -1,8 +1,14 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 Running Project, hdfirmware
 Date, Mon Sep 14 15:16:29 PDT 2020
+=======
 
+Running Project, hdfirmware
+Date, Thu Oct  8 17:09:52 PDT 2020
+>>>>>>> DEN-4308-hd-valve-control-1-of-2
+
 VectorCAST Pass/Fail Status, Passed
 
 Unit Test Coverage, Passed
@@ -17,6 +23,10 @@
 alarmmgmt,updateAlarmsFlags
 dialinflow,execDialInFlowTest
 alarmlamp,setAlarmLampToPatternStep
+<<<<<<< HEAD
+=======
+valves,handleValveStateHomingNotStarted
+>>>>>>> DEN-4308-hd-valve-control-1-of-2
 bloodflow,execBloodFlowTest
 dialysis,handleUFPausedState
 dialysis,handleUFRunningState
@@ -88,6 +98,11 @@
 systemcomm,clearCANXmitBuffers
 systemcomm,checkTooManyBadMsgCRCs
 systemcomm,matchACKtoPendingACKList
+<<<<<<< HEAD
+=======
+valves,getValvePosition
+valves,getValveAirTrapStatus
+>>>>>>> DEN-4308-hd-valve-control-1-of-2
 dginterface,getDGPressure
 dginterface,getDGROPumpPressureSetPt
 dginterface,getDGROPumpFlowRateMlMin
@@ -152,6 +167,7 @@
 CppCheck, Passed
 Cppcheck No. of Warnings, 0
 
+<<<<<<< HEAD
 =======
 ,,,,,,
 Running Project, hdfirmware,,,,,
@@ -371,3 +387,5 @@
 CppCheck, Failed,,,,,
 Cppcheck No. of Warnings,0,,,,,
 >>>>>>> DEN-4308-hd-valve-control-1-of-2
+=======
+>>>>>>> DEN-4308-hd-valve-control-1-of-2