Index: firmware/App/HDCommon.h
===================================================================
diff -u -r2933aca15e35db868d6dcd104d9047424221612d -r74be223d47ea7bb0ac7d814e74d3627d830a5fac
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 2933aca15e35db868d6dcd104d9047424221612d)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 74be223d47ea7bb0ac7d814e74d3627d830a5fac)
@@ -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
 *
+<<<<<<< HEAD
 * @author  (last) Sean Nash
 * @date    (last) 14-Oct-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__
@@ -58,7 +66,7 @@
     #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
     #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_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)