Index: firmware/App/HDCommon.h
===================================================================
diff -u -rb1cbc9fbf69b7f95014cd28a4e8ff2d83e5be208 -r9137c3932fbc99d828dd2577fce4d7871c765415
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision b1cbc9fbf69b7f95014cd28a4e8ff2d83e5be208)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 9137c3932fbc99d828dd2577fce4d7871c765415)
@@ -7,20 +7,12 @@
 *
 * @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__
@@ -76,7 +68,7 @@
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
     #define ALARM_VOLUME_DEFAULT_LOW        1           // Set default alarm volume to lowest
     #define DISABLE_BATT_COMM               1           // Disable battery communication.
-    #define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
+    //#define SKIP_AIR_BUBBLE_CHECK           1           // Skip air bubble detector self-test.
     #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