Index: firmware/App/HDCommon.h
===================================================================
diff -u -reb93a171581e5f3c471a8f49e47cef54df0bd5be -r77fbf2a6d3320f10257c49128734a82fc8a978f2
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision eb93a171581e5f3c471a8f49e47cef54df0bd5be)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 77fbf2a6d3320f10257c49128734a82fc8a978f2)
@@ -14,15 +14,6 @@
 * @date    (original)  27-Feb-2020
 *
 ***************************************************************************/
-=======
-* @date    (last)      06-Feb-2024
->>>>>>> release/p1_staging
-*
-* @author  (original)  Sean
-* @date    (original)  27-Feb-2020
-*
-***************************************************************************/
-
 #ifndef __HD_COMMON_H__
 #define __HD_COMMON_H__