Index: firmware/App/HDCommon.h
===================================================================
diff -u -r46617afb446c35270b59e21085b270433d13d113 -r82e9c6f8c12f684f5aca406e93ff31554017eee8
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 46617afb446c35270b59e21085b270433d13d113)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 82e9c6f8c12f684f5aca406e93ff31554017eee8)
@@ -1,18 +1,26 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file HDCommon.h
+* @file    HDCommon.h
 *
-* @author (last) Sean Nash
-* @date (last) 14-Oct-2020
+<<<<<<< HEAD
+* @author  (last) Sean Nash
+* @date    (last) 14-Oct-2020
 *
-* @author (original) Sean
-* @date (original) 27-Feb-2020
+* @author  (original) Sean
+* @date    (original) 27-Feb-2020
+=======
+* @author  (last)      Quang Nguyen
+* @date    (last)      09-Aug-2021
 *
+* @author  (original)  Sean
+* @date    (original)  27-Feb-2020
+>>>>>>> DEN-9480-dialysate-temperature-control
+*
 ***************************************************************************/
 
 #ifndef __HD_COMMON_H__
@@ -25,7 +33,7 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        6
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        0
+#define HD_VERSION_BUILD        91
 
 // ********** development build switches **********
 
@@ -57,8 +65,9 @@
 //    #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
     #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
-//    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
-//    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
+    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
+    #define DISABLE_DIALYSATE_TEMP_CHECK    1           // Disable dialysate temperature check
+    #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
     #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position
     #define SKIP_CAL_CHECK                  1           //
 //    #define RUN_PUMPS_OPEN_LOOP             1           // BP and DPi pumps will be run open loop (no flow sensor feedback)
@@ -71,7 +80,7 @@
     #define DISABLE_OCCLUSION_SELF_TEST     1           // Skip occlusion sensor self-test.
 //    #define SKIP_CARTRIDGE_REMOVAL          1           // Skip cartridge removal check
 //    #define DISABLE_FPGA_COUNTER_CHECKS     1           // Disable alarms associated with FPGA read/error counters
-//    #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
+    #define DISABLE_VOLTAGE_MONITOR         1           // Disable voltage monitoring/alarms
     #define ALLOW_1_MIN_TREATMENT_DURATION  1           // Allow user to change treatment duration to as low as 1 minute
     #define DISABLE_SYRINGE_PUMP_ALARMS     1           // Disable some syringe pump alarms that are triggering intermittently
 //    #define NO_PUMP_FLOW_LIMITS             1           // Allow any commanded flow rate for peristaltic pumps