Index: results/Build_Status_Report.csv
===================================================================
diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -r6733463d7498c5d81709629fa0952c543da3619d
--- results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
+++ results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision 6733463d7498c5d81709629fa0952c543da3619d)
@@ -1,10 +1,6 @@
 
 Running Project, hdfirmware
-<<<<<<< HEAD
-Date, Fri Nov 13 11:48:25 PST 2020
-=======
-Date, Wed Oct 14 09:03:18 PDT 2020
->>>>>>> master
+Date, Mon Nov 16 09:13:14 PST 2020
 
 VectorCAST Pass/Fail Status, Passed
 
@@ -26,7 +22,6 @@
 valves,handleValveStateHomingNotStarted
 bloodflow,checkBloodFlowSensorSignalStrength
 bloodflow,execBloodFlowTest
-dialysis,transitionToDialysis
 dialysis,handleUFPausedState
 dialysis,handleUFRunningState
 dialysis,handleSalineBolusInProgressState
@@ -92,11 +87,8 @@
 dialoutflow,homeDialOutPump
 dialoutflow,handleDialOutPumpControlToTargetState
 alarmmgmt,isAlarmActive
-<<<<<<< HEAD
 alarmmgmt,getCurrentAlarmStatePriority
-=======
 alarmmgmt,isAlarmRecoverable
->>>>>>> master
 alarmmgmt,getAlarmStartTime
 alarmmgmt,resetAlarmPriorityFIFO
 systemcomm,isDGCommunicating
@@ -127,6 +119,7 @@
 dialinflow,handleDialInPumpControlToTargetState
 dialinflow,execDialInFlowTest
 dialinflow,getDialInFlowCalibration
+airtrap,startAirTrapControl
 airtrap,execAirTrapMonitorPriming
 airtrap,handleAirTrapValveClosedState
 airtrap,handleAirTrapValveOpenState
@@ -141,7 +134,6 @@
 fpga,getFPGABloodPumpHallSensorStatus
 fpga,getFPGADialInPumpHallSensorStatus
 fpga,getFPGADialOutPumpHallSensorStatus
-fpga,getFPGAAirTrapLevels
 bloodflow,signalBloodPumpHardStop
 bloodflow,homeBloodPump
 bloodflow,getBloodPumpRotorCount