Index: firmware/App/HDCommon.h
===================================================================
diff -u -rdfdb0b0216ce75f3583d9be75d103cfb4c3045bb -ra58294290ebc2f06c387caec10e6741bf9fea1e6
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision dfdb0b0216ce75f3583d9be75d103cfb4c3045bb)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a58294290ebc2f06c387caec10e6741bf9fea1e6)
@@ -8,7 +8,11 @@
 * @file    HDCommon.h
 *
 * @author  (last)      Dara Navaei
+<<<<<<< HEAD
+* @date    (last)      17-Jan-2024
+=======
 * @date    (last)      06-Feb-2024
+>>>>>>> release/p1_staging
 *
 * @author  (original)  Sean
 * @date    (original)  27-Feb-2020
@@ -25,7 +29,7 @@
 #define HD_VERSION_MAJOR        1
 #define HD_VERSION_MINOR        0
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        29
+#define HD_VERSION_BUILD        4
 
 // ********** development build switches **********