Index: firmware/App/HDCommon.h
===================================================================
diff -u -ra58294290ebc2f06c387caec10e6741bf9fea1e6 -r49a72a318c16b62d821eb5de1bd708cf0edd67cc
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision a58294290ebc2f06c387caec10e6741bf9fea1e6)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 49a72a318c16b62d821eb5de1bd708cf0edd67cc)
@@ -8,8 +8,12 @@
 * @file    HDCommon.h
 *
 * @author  (last)      Dara Navaei
-<<<<<<< HEAD
-* @date    (last)      17-Jan-2024
+* @date    (last)      19-Mar-2024
+*
+* @author  (original)  Sean
+* @date    (original)  27-Feb-2020
+*
+***************************************************************************/
 =======
 * @date    (last)      06-Feb-2024
 >>>>>>> release/p1_staging