Index: results/cppcheckError.csv
===================================================================
diff -u -r5854029e95eca38ed459ac74ac013b240f7fc5d1 -r615e4900fa0e284bd387312e597f839b6ee8584a
--- results/cppcheckError.csv	(.../cppcheckError.csv)	(revision 5854029e95eca38ed459ac74ac013b240f7fc5d1)
+++ results/cppcheckError.csv	(.../cppcheckError.csv)	(revision 615e4900fa0e284bd387312e597f839b6ee8584a)
@@ -1,25 +1,32 @@
 File, Line No., Severity, Issue, Description
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 hdfirmware/firmware/App/Controllers/BloodFlow.c,815,style,unreadVariable,Variable 'flowStPt' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,817,style,unreadVariable,Variable 'measRotSpd' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,818,style,unreadVariable,Variable 'measSpd' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,819,style,unreadVariable,Variable 'measMCSpd' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,820,style,unreadVariable,Variable 'measMCCurr' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,821,style,unreadVariable,Variable 'pumpPWMPctDutyCycle' is assigned a value that is never used.
 =======
+=======
+>>>>>>> Stashed changes
 hdfirmware/firmware/App/Controllers/BloodFlow.c,812,style,unreadVariable,Variable 'flowStPt' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,814,style,unreadVariable,Variable 'measRotSpd' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,815,style,unreadVariable,Variable 'measSpd' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,816,style,unreadVariable,Variable 'measMCSpd' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,817,style,unreadVariable,Variable 'measMCCurr' is assigned a value that is never used.
 hdfirmware/firmware/App/Controllers/BloodFlow.c,818,style,unreadVariable,Variable 'pumpPWMPctDutyCycle' is assigned a value that is never used.
 hdfirmware/firmware/App/Drivers/SafetyShutdown.c,100,style,unusedVariable,Unused variable: dir
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 hdfirmware/firmware/App/Modes/Dialysis.c,274,style,unreadVariable,Variable 'rejectReason' is assigned a value that is never used.
 hdfirmware/firmware/App/Modes/Dialysis.c,325,style,unreadVariable,Variable 'rejectReason' is assigned a value that is never used.
 hdfirmware/firmware/App/Modes/ModePostTreat.c,87,style,unreadVariable,Variable 'stop' is assigned a value that is never used.
 hdfirmware/firmware/App/Modes/ModePreTreat.c,87,style,unreadVariable,Variable 'stop' is assigned a value that is never used.
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 hdfirmware/firmware/App/Modes/ModeTreatmentParams.c,131,style,unreadVariable,Variable 'stop' is assigned a value that is never used.
 hdfirmware/firmware/App/Services/Interrupts.c,180,style,variableScope,The scope of the variable 'debugStr' can be reduced.
 hdfirmware/firmware/App/Services/SystemCommMessages.c,1325,style,unreadVariable,Variable 'result' is assigned a value that is never used.
@@ -41,6 +48,8 @@
 hdfirmware/firmware/App/Services/Interrupts.c,177,style,unusedFunction,The function 'canErrorNotification' is never used.
 hdfirmware/firmware/App/Services/Interrupts.c,156,style,unusedFunction,The function 'canMessageNotification' is never used.
 =======
+=======
+>>>>>>> Stashed changes
 hdfirmware/firmware/App/Modes/ModeTreatment.c,559,style,unreadVariable,Variable 'oldUFRate' is assigned a value that is never used.
 hdfirmware/firmware/App/Modes/ModeTreatmentParams.c,86,style,unreadVariable,Variable 'stop' is assigned a value that is never used.
 hdfirmware/firmware/App/Services/Interrupts.c,147,style,variableScope,The scope of the variable 'debugStr' can be reduced.
@@ -60,12 +69,16 @@
 hdfirmware/firmware/App/Services/Interrupts.c,143,style,unusedFunction,The function 'canErrorNotification' is never used.
 hdfirmware/firmware/App/Services/Interrupts.c,122,style,unusedFunction,The function 'canMessageNotification' is never used.
 hdfirmware/firmware/FWCommon/PersistentAlarm.c,96,style,unusedFunction,The function 'checkPersistentAlarm' is never used.
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 hdfirmware/firmware/App/Controllers/DGInterface.c,642,style,unusedFunction,The function 'cmdDGSampleWater' is never used.
 hdfirmware/firmware/App/Controllers/DGInterface.c,560,style,unusedFunction,The function 'cmdStartDGTrimmerHeater' is never used.
 hdfirmware/firmware/App/Controllers/DGInterface.c,545,style,unusedFunction,The function 'cmdStopDG' is never used.
 hdfirmware/firmware/App/Controllers/DGInterface.c,575,style,unusedFunction,The function 'cmdStopDGTrimmerHeater' is never used.
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 hdfirmware/firmware/App/Services/Interrupts.c,322,style,unusedFunction,The function 'dmaGroupANotification' is never used.
 hdfirmware/firmware/App/Services/Interrupts.c,369,style,unusedFunction,The function 'edgeNotification' is never used.
 hdfirmware/firmware/App/Services/FPGA.c,1359,style,unusedFunction,The function 'enableFPGAValvesBypassControl' is never used.
@@ -74,6 +87,8 @@
 hdfirmware/firmware/App/Controllers/BloodFlow.c,1258,style,unusedFunction,The function 'getBloodFlowCalibration' is never used.
 hdfirmware/firmware/FWCommon/NVDataMgmt.c,728,style,unusedFunction,The function 'getBootloaderFlag' is never used.
 =======
+=======
+>>>>>>> Stashed changes
 hdfirmware/firmware/App/Services/Interrupts.c,274,style,unusedFunction,The function 'dmaGroupANotification' is never used.
 hdfirmware/firmware/App/Services/Interrupts.c,321,style,unusedFunction,The function 'edgeNotification' is never used.
 hdfirmware/firmware/FWCommon/Accel.c,133,style,unusedFunction,The function 'execAccel' is never used.
@@ -84,12 +99,16 @@
 hdfirmware/firmware/FWCommon/Accel.c,670,style,unusedFunction,The function 'getAccelCalibration' is never used.
 hdfirmware/firmware/FWCommon/NVDataMgmt.c,723,style,unusedFunction,The function 'getBootloaderFlag' is never used.
 hdfirmware/firmware/FWCommon/Utilities.c,254,style,unusedFunction,The function 'getCriticalData' is never used.
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 hdfirmware/firmware/App/Controllers/DGInterface.c,362,style,unusedFunction,The function 'getDGDrainPumpRPMSetPt' is never used.
 hdfirmware/firmware/App/Controllers/DGInterface.c,305,style,unusedFunction,The function 'getDGPressure' is never used.
 hdfirmware/firmware/App/Controllers/DGInterface.c,346,style,unusedFunction,The function 'getDGROPumpFlowRateMlMin' is never used.
 hdfirmware/firmware/App/Controllers/DGInterface.c,330,style,unusedFunction,The function 'getDGROPumpPressureSetPt' is never used.
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 hdfirmware/firmware/App/Controllers/DialInFlow.c,1229,style,unusedFunction,The function 'getDialInFlowCalibration' is never used.
 hdfirmware/firmware/FWCommon/NVDataMgmt.c,594,style,unusedFunction,The function 'getDisinfectionDate' is never used.
 hdfirmware/firmware/App/Services/FPGA.c,1136,style,unusedFunction,The function 'getFPGABloodPumpHallSensorStatus' is never used.
@@ -142,6 +161,8 @@
 hdfirmware/firmware/App/Controllers/Valves.c,1045,style,unusedFunction,The function 'testSetValvesPositionOverride' is never used.
 hdfirmware/firmware/FWCommon/NVDataMgmt.c,438,style,unusedFunction,The function 'writeLogData' is never used.
 =======
+=======
+>>>>>>> Stashed changes
 hdfirmware/firmware/FWCommon/NVDataMgmt.c,592,style,unusedFunction,The function 'getDisinfectionDate' is never used.
 hdfirmware/firmware/App/Services/FPGA.c,1114,style,unusedFunction,The function 'getFPGABloodPumpHallSensorStatus' is never used.
 hdfirmware/firmware/App/Services/FPGA.c,1148,style,unusedFunction,The function 'getFPGADialInPumpHallSensorStatus' is never used.
@@ -187,5 +208,8 @@
 hdfirmware/firmware/FWCommon/Accel.c,687,style,unusedFunction,The function 'testSetAccelDataPublishIntervalOverride' is never used.
 hdfirmware/firmware/FWCommon/Accel.c,790,style,unusedFunction,The function 'testSetAccelMaxOverride' is never used.
 hdfirmware/firmware/FWCommon/NVDataMgmt.c,443,style,unusedFunction,The function 'writeLogData' is never used.
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 ,,information,missingInclude,Cppcheck cannot find all the include files (use --check-config for details)